Addition of missing clan mastery skills.

This commit is contained in:
MobiusDev 2019-02-16 11:44:56 +00:00
parent 271de4803a
commit 1672edcc8f
10 changed files with 1164 additions and 72 deletions

View File

@ -1,19 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ClanMasteryData.xsd">
<clan mastery="1" skilId="1" skillLevel="1" clanLevel="5" clanReputation="10000" /> <!-- middle -->
<clan mastery="2" skilId="1" skillLevel="1" clanLevel="6" clanReputation="10000" previousMastery="1" /> <!-- middle -->
<clan mastery="3" skilId="1" skillLevel="1" clanLevel="7" clanReputation="10000" previousMastery="2" /> <!-- middle -->
<clan mastery="4" skilId="1" skillLevel="1" clanLevel="11" clanReputation="50000" previousMastery="9" previousMasteryAlt="14" /> <!-- middle -->
<clan mastery="5" skilId="1" skillLevel="1" clanLevel="14" clanReputation="100000" previousMastery="11" previousMasteryAlt="16" /> <!-- middle -->
<clan mastery="6" skilId="1" skillLevel="1" clanLevel="15" clanReputation="100000" previousMastery="5" /> <!-- middle -->
<clan mastery="7" skilId="1" skillLevel="1" clanLevel="8" clanReputation="30000" previousMastery="3" /> <!-- left -->
<clan mastery="8" skilId="1" skillLevel="1" clanLevel="9" clanReputation="30000" previousMastery="7" /> <!-- left -->
<clan mastery="9" skilId="1" skillLevel="1" clanLevel="10" clanReputation="30000" previousMastery="8" /> <!-- left -->
<clan mastery="10" skilId="1" skillLevel="1" clanLevel="12" clanReputation="50000" previousMastery="4" /> <!-- left -->
<clan mastery="11" skilId="1" skillLevel="1" clanLevel="13" clanReputation="50000" previousMastery="10" /> <!-- left -->
<clan mastery="12" skilId="1" skillLevel="1" clanLevel="8" clanReputation="30000" previousMastery="3" /> <!-- right -->
<clan mastery="13" skilId="1" skillLevel="1" clanLevel="9" clanReputation="30000" previousMastery="12" /> <!-- right -->
<clan mastery="14" skilId="1" skillLevel="1" clanLevel="10" clanReputation="30000" previousMastery="13" /> <!-- right -->
<clan mastery="15" skilId="1" skillLevel="1" clanLevel="12" clanReputation="50000" previousMastery="14" /> <!-- right -->
<clan mastery="16" skilId="1" skillLevel="1" clanLevel="13" clanReputation="50000" previousMastery="15" /> <!-- right -->
<!-- Clan Specialty level 1 -->
<clan mastery="1" skill1Id="19543" skill1Level="1" skill2Id="19544" skill2Level="1" skill3Id="19545" skill3Level="1" skill4Id="391" skill4Level="1" clanLevel="5" clanReputation="10000" />
<!-- Clan Specialty level 2 -->
<clan mastery="2" skill1Id="19543" skill1Level="2" skill2Id="19544" skill2Level="1" skill3Id="19545" skill3Level="2" skill4Id="19007" skill4Level="1" clanLevel="6" clanReputation="10000" previousMastery="1" />
<!-- Clan Specialty level 3 -->
<clan mastery="3" skill1Id="19543" skill1Level="3" skill2Id="19544" skill2Level="3" skill3Id="19545" skill3Level="3" skill4Id="19112" skill4Level="1" clanLevel="7" clanReputation="10000" previousMastery="2" />
<!-- Clan Specialty level 4 -->
<clan mastery="4" skill1Id="19543" skill1Level="4" skill2Id="19544" skill2Level="4" skill3Id="19545" skill3Level="4" skill4Id="19008" skill4Level="1" clanLevel="11" clanReputation="50000" previousMastery="9" previousMasteryAlt="14" />
<!-- Clan Specialty level 5 -->
<clan mastery="5" skill1Id="19543" skill1Level="5" skill2Id="19544" skill2Level="5" skill3Id="19545" skill3Level="5" clanLevel="14" clanReputation="100000" previousMastery="11" previousMasteryAlt="16" />
<!-- Clan Specialty level 6 -->
<clan mastery="6" skill1Id="19543" skill1Level="6" skill2Id="19544" skill2Level="6" skill3Id="19545" skill3Level="6" skill4Id="19543" skill4Level="4" clanLevel="15" clanReputation="100000" previousMastery="5" />
<!-- Combat Specialty level 1 -->
<clan mastery="7" skill1Id="19531" skill1Level="1" skill2Id="19532" skill2Level="1" clanLevel="8" clanReputation="30000" previousMastery="3" />
<!-- Combat Specialty level 2 -->
<clan mastery="8" skill1Id="19531" skill1Level="2" skill2Id="19532" skill2Level="2" clanLevel="9" clanReputation="30000" previousMastery="7" />
<!-- Combat Specialty level 3 -->
<clan mastery="9" skill1Id="19531" skill1Level="3" skill2Id="19532" skill2Level="3" skill3Id="19533" skill3Level="1" clanLevel="10" clanReputation="30000" previousMastery="8" />
<!-- Combat Specialty level 4 -->
<clan mastery="10" skill1Id="19531" skill1Level="4" skill2Id="19534" skill2Level="1" clanLevel="12" clanReputation="50000" previousMastery="4" />
<!-- Combat Specialty level 5 -->
<clan mastery="11" skill1Id="19534" skill1Level="2" clanLevel="13" clanReputation="50000" previousMastery="10" />
<!-- War Specialty level 1 -->
<clan mastery="12" skill1Id="19013" skill1Level="1" skill2Id="19535" skill2Level="1" clanLevel="8" clanReputation="30000" previousMastery="3" />
<!-- War Specialty level 2 -->
<clan mastery="13" skill1Id="19113" skill1Level="1" skill2Id="19535" skill2Level="2" clanLevel="9" clanReputation="30000" previousMastery="12" />
<!-- War Specialty level 3 -->
<clan mastery="14" skill1Id="19114" skill1Level="1" skill2Id="19535" skill2Level="3" skill3Id="19536" skill3Level="1" clanLevel="10" clanReputation="30000" previousMastery="13" />
<!-- War Specialty level 4 -->
<clan mastery="15" skill1Id="15094" skill1Level="1" skill2Id="19537" skill2Level="1" clanLevel="12" clanReputation="50000" previousMastery="14" />
<!-- War Specialty level 5 -->
<clan mastery="16" skill1Id="19537" skill1Level="2" clanLevel="13" clanReputation="50000" previousMastery="15" />
</list>

View File

@ -85,8 +85,7 @@
<operateType>A2</operateType>
<reuseDelay>1</reuseDelay>
<effects>
<effect name="LimitSkill">
</effect>
<effect name="LimitSkill" />
</effects>
</skill>
<skill id="19527" toLevel="3" name="Limit of Iss">
@ -102,4 +101,480 @@
<effect name="LimitSkill" />
</effects>
</skill>
<skill id="19531" toLevel="4" name="Clan Hunter">
<!-- Clan members' P. Atk. +$s1, M. Atk. +$s2, P. Def. +$s3, and M. Def +$s4. -->
<icon>icon.skill19531</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PAtk">
<amount>
<value level="1">1</value>
<value level="2">2</value>
<value level="3">3</value>
<value level="4">4</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MAtk">
<amount>
<value level="1">1</value>
<value level="2">3</value>
<value level="3">5</value>
<value level="4">7</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="PhysicalDefence">
<amount>
<value level="1">1</value>
<value level="2">2</value>
<value level="3">3</value>
<value level="4">4</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MagicalDefence">
<amount>
<value level="1">1</value>
<value level="2">2</value>
<value level="3">3</value>
<value level="4">4</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19532" toLevel="3" name="Clan Elemental">
<!-- All clan members' defense attributes +$s1. -->
<icon>icon.skill19003</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>FIRE</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>WATER</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>WIND</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>EARTH</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>HOLY</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>DARK</attribute>
</effect>
</effects>
</skill>
<skill id="19533" toLevel="1" name="Clan Rating">
<!-- Points gained at the end of the Throne of Heroes Boss Battle +$s1. -->
<icon>icon.skill19533</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
</skill>
<skill id="19534" toLevel="2" name="Clan Barrier">
<!-- Clan members' P. Def and M. Def. +$s1. -->
<icon>icon.skill19534</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PhysicalDefence">
<amount>
<value level="1">3</value>
<value level="2">5</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MagicalDefence">
<amount>
<value level="1">3</value>
<value level="2">5</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19535" toLevel="3" name="Clan Resistance">
<!-- Clan members' Resistance to Stun/ Paralysis/ MEN/ Aerial Yoke/ Knock Back/ Knock Down +$s1. -->
<icon>icon.skill19004</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="DefenceTrait">
<SHOCK>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</SHOCK>
<PARALYZE>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</PARALYZE>
<DERANGEMENT>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</DERANGEMENT>
<AIRBIND>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</AIRBIND>
<KNOCKBACK>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</KNOCKBACK>
<KNOCKDOWN>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</KNOCKDOWN>
</effect>
</effects>
</skill>
<skill id="19536" toLevel="1" name="Clan Battlefield">
<!-- For $s1, Max HP/ MP/ CP +$s2, P. Atk. +$s3, M. Atk. +$s4, and Speed +$s5. Consumes $s6 Spirit Ore. Only available in the battlefield. -->
<icon>icon.skill19536</icon>
<itemConsumeId>3031</itemConsumeId>
<itemConsumeCount>5</itemConsumeCount>
<operateType>A2</operateType>
<targetType>SELF</targetType>
<hitTime>1000</hitTime>
<coolTime>500</coolTime>
<reuseDelay>300000</reuseDelay>
<effectPoint>100</effectPoint>
</skill>
<skill id="19537" toLevel="2" name="Clan Iron">
<!-- Clan members' PVP Damage Received -$s1. -->
<icon>icon.skill0386</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PvpPhysicalAttackDefenceBonus">
<amount>
<value level="1">5</value>
<value level="2">7</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="PvpMagicalSkillDefenceBonus">
<amount>
<value level="1">5</value>
<value level="2">7</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="PvpPhysicalSkillDefenceBonus">
<amount>
<value level="1">5</value>
<value level="2">7</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19538" toLevel="1" name="Clan Vitality">
<!-- Clan members' XP and SP gain +$s1. -->
<icon>icon.skill19538</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="ExpModify">
<amount>10</amount>
<mode>PER</mode>
</effect>
<effect name="SpModify">
<amount>10</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19539" toLevel="1" name="Clan Battle">
<!-- Clan members' P. Atk. +$s1 and M. Atk. +$s2. -->
<icon>icon.skill19539</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PAtk">
<amount>5</amount>
<mode>PER</mode>
</effect>
<effect name="MAtk">
<amount>10</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19540" toLevel="1" name="Clan Blood">
<!-- Clan members' PvE Damage +$s1. -->
<icon>icon.skill19540</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PveMagicalSkillDamageBonus">
<amount>5</amount>
<type>ENEMY_ALL</type>
<mode>PER</mode>
</effect>
<effect name="PvePhysicalAttackDamageBonus">
<amount>5</amount>
<type>ENEMY_ALL</type>
<mode>PER</mode>
</effect>
<effect name="PvePhysicalSkillDamageBonus">
<amount>5</amount>
<type>ENEMY_ALL</type>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19541" toLevel="1" name="Clan Cry">
<!-- Clan members' Skill Power +$s1. -->
<icon>icon.skill19541</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PhysicalSkillPower">
<amount>5</amount>
<mode>PER</mode>
</effect>
<effect name="PhysicalSkillPower">
<amount>5</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19542" toLevel="1" name="Clan Darkness">
<!-- Clan members' PvP Damage +$s1. -->
<icon>icon.skill19542</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PvpPhysicalAttackDamageBonus">
<amount>5</amount>
<mode>PER</mode>
</effect>
<effect name="PvpMagicalSkillDamageBonus">
<amount>5</amount>
<mode>PER</mode>
</effect>
<effect name="PvpPhysicalSkillDamageBonus">
<amount>5</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19543" toLevel="11" name="Clan Combat">
<!-- Clan members' P. Atk. +$s1, M. Atk. +$s2, P. Def. +$s3, and M. Def +$s4. -->
<icon>icon.skill19543</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PAtk">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">7</value>
<value level="5">9</value>
<value level="6">11</value>
<value level="7">9</value>
<value level="8">10</value>
<value level="9">11</value>
<value level="10">12</value>
<value level="11">13</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MAtk">
<amount>
<value level="1">6</value>
<value level="2">8</value>
<value level="3">10</value>
<value level="4">14</value>
<value level="5">18</value>
<value level="6">22</value>
<value level="7">18</value>
<value level="8">20</value>
<value level="9">22</value>
<value level="10">24</value>
<value level="11">26</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="PhysicalDefence">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">7</value>
<value level="5">9</value>
<value level="6">11</value>
<value level="7">9</value>
<value level="8">10</value>
<value level="9">11</value>
<value level="10">12</value>
<value level="11">13</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MagicalDefence">
<amount>
<value level="1">4</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">7</value>
<value level="5">9</value>
<value level="6">11</value>
<value level="7">9</value>
<value level="8">10</value>
<value level="9">11</value>
<value level="10">12</value>
<value level="11">13</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19544" toLevel="6" name="Clan Will">
<!-- Clan members' XP and SP gain +$s1. -->
<icon>icon.skill19544</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="ExpModify">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="SpModify">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19545" toLevel="6" name="Clan Condition">
<!-- Clan members' Max HP/ MP/ CP +$s1 and HP/ MP/ CP Recovery +$s2. -->
<icon>icon.skill19545</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="MaxHp">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MaxMp">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MaxCp">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="HpRegen">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MpRegen">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="CpRegen">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
</list>

View File

@ -7,8 +7,14 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="mastery" use="required"/>
<xs:attribute type="xs:int" name="skilId" use="required"/>
<xs:attribute type="xs:int" name="skillLevel" use="required"/>
<xs:attribute type="xs:int" name="skill1Id" use="required"/>
<xs:attribute type="xs:int" name="skill1Level" use="required"/>
<xs:attribute type="xs:int" name="skill2Id" use="optional"/>
<xs:attribute type="xs:int" name="skill2Level" use="optional"/>
<xs:attribute type="xs:int" name="skill3Id" use="optional"/>
<xs:attribute type="xs:int" name="skill3Level" use="optional"/>
<xs:attribute type="xs:int" name="skill4Id" use="optional"/>
<xs:attribute type="xs:int" name="skill4Level" use="optional"/>
<xs:attribute type="xs:int" name="clanLevel" use="required"/>
<xs:attribute type="xs:int" name="clanReputation" use="required"/>
<xs:attribute type="xs:int" name="previousMastery" use="optional"/>

View File

@ -58,22 +58,56 @@ public class ClanMasteryData implements IGameXmlReader
{
final StatsSet set = new StatsSet(parseAttributes(clanNode));
final int id = set.getInt("mastery");
final int skillId = set.getInt("skilId");
final int skillLevel = set.getInt("skillLevel");
final int skill1Id = set.getInt("skill1Id");
final int skill1Level = set.getInt("skill1Level");
final Skill skill1 = SkillData.getInstance().getSkill(skill1Id, skill1Level);
if (skill1 == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skill1Id + " with level " + skill1Level + " does not exist.");
return;
}
final int skill2Id = set.getInt("skill2Id", 0);
final int skill2Level = set.getInt("skill2Level", 0);
Skill skill2 = null;
if (skill2Id > 0)
{
skill2 = SkillData.getInstance().getSkill(skill2Id, skill2Level);
if (skill2 == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skill2Id + " with level " + skill2Level + " does not exist.");
return;
}
}
final int skill3Id = set.getInt("skill3Id", 0);
final int skill3Level = set.getInt("skill3Level", 0);
Skill skill3 = null;
if (skill3Id > 0)
{
skill3 = SkillData.getInstance().getSkill(skill3Id, skill3Level);
if (skill3 == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skill3Id + " with level " + skill3Level + " does not exist.");
return;
}
}
final int skill4Id = set.getInt("skill4Id", 0);
final int skill4Level = set.getInt("skill4Level", 0);
Skill skill4 = null;
if (skill4Id > 0)
{
skill4 = SkillData.getInstance().getSkill(skill4Id, skill4Level);
if (skill4 == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skill4Id + " with level " + skill4Level + " does not exist.");
return;
}
}
final int clanLevel = set.getInt("clanLevel");
final int clanReputation = set.getInt("clanReputation");
final int previousMastery = set.getInt("previousMastery", 0);
final int previousMasteryAlt = set.getInt("previousMasteryAlt", 0);
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skillId + " with level " + skillLevel + " does not exist.");
}
else
{
_clanMasteryData.add(new ClanMasteryHolder(id, skill, clanLevel, clanReputation, previousMastery, previousMasteryAlt));
}
_clanMasteryData.add(new ClanMasteryHolder(id, skill1, skill2, skill3, skill4, clanLevel, clanReputation, previousMastery, previousMasteryAlt));
}));
}

View File

@ -16,6 +16,9 @@
*/
package com.l2jmobius.gameserver.model.holders;
import java.util.ArrayList;
import java.util.List;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
@ -24,20 +27,32 @@ import com.l2jmobius.gameserver.model.skills.Skill;
public class ClanMasteryHolder
{
private final int _id;
private final Skill _skill;
private final List<Skill> _skills = new ArrayList<>();
private final int _clanLevel;
private final int _clanReputation;
private final int _previousMastery;
private final int _previousMasteryAlt;
public ClanMasteryHolder(int id, Skill skill, int clanLevel, int clanReputation, int previousMastery, int previousMasteryAlt)
public ClanMasteryHolder(int id, Skill skill1, Skill skill2, Skill skill3, Skill skill4, int clanLevel, int clanReputation, int previousMastery, int previousMasteryAlt)
{
_id = id;
_skill = skill;
_clanLevel = clanLevel;
_clanReputation = clanReputation;
_previousMastery = previousMastery;
_previousMasteryAlt = previousMasteryAlt;
_skills.add(skill1);
if (skill2 != null)
{
_skills.add(skill2);
}
if (skill3 != null)
{
_skills.add(skill3);
}
if (skill4 != null)
{
_skills.add(skill4);
}
}
public int getId()
@ -45,9 +60,9 @@ public class ClanMasteryHolder
return _id;
}
public Skill getSkill()
public List<Skill> getSkills()
{
return _skill;
return _skills;
}
public int getClanLevel()

View File

@ -1,19 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/ClanMasteryData.xsd">
<clan mastery="1" skilId="1" skillLevel="1" clanLevel="5" clanReputation="10000" /> <!-- middle -->
<clan mastery="2" skilId="1" skillLevel="1" clanLevel="6" clanReputation="10000" previousMastery="1" /> <!-- middle -->
<clan mastery="3" skilId="1" skillLevel="1" clanLevel="7" clanReputation="10000" previousMastery="2" /> <!-- middle -->
<clan mastery="4" skilId="1" skillLevel="1" clanLevel="11" clanReputation="50000" previousMastery="9" previousMasteryAlt="14" /> <!-- middle -->
<clan mastery="5" skilId="1" skillLevel="1" clanLevel="14" clanReputation="100000" previousMastery="11" previousMasteryAlt="16" /> <!-- middle -->
<clan mastery="6" skilId="1" skillLevel="1" clanLevel="15" clanReputation="100000" previousMastery="5" /> <!-- middle -->
<clan mastery="7" skilId="1" skillLevel="1" clanLevel="8" clanReputation="30000" previousMastery="3" /> <!-- left -->
<clan mastery="8" skilId="1" skillLevel="1" clanLevel="9" clanReputation="30000" previousMastery="7" /> <!-- left -->
<clan mastery="9" skilId="1" skillLevel="1" clanLevel="10" clanReputation="30000" previousMastery="8" /> <!-- left -->
<clan mastery="10" skilId="1" skillLevel="1" clanLevel="12" clanReputation="50000" previousMastery="4" /> <!-- left -->
<clan mastery="11" skilId="1" skillLevel="1" clanLevel="13" clanReputation="50000" previousMastery="10" /> <!-- left -->
<clan mastery="12" skilId="1" skillLevel="1" clanLevel="8" clanReputation="30000" previousMastery="3" /> <!-- right -->
<clan mastery="13" skilId="1" skillLevel="1" clanLevel="9" clanReputation="30000" previousMastery="12" /> <!-- right -->
<clan mastery="14" skilId="1" skillLevel="1" clanLevel="10" clanReputation="30000" previousMastery="13" /> <!-- right -->
<clan mastery="15" skilId="1" skillLevel="1" clanLevel="12" clanReputation="50000" previousMastery="14" /> <!-- right -->
<clan mastery="16" skilId="1" skillLevel="1" clanLevel="13" clanReputation="50000" previousMastery="15" /> <!-- right -->
<!-- Clan Specialty level 1 -->
<clan mastery="1" skill1Id="19543" skill1Level="1" skill2Id="19544" skill2Level="1" skill3Id="19545" skill3Level="1" skill4Id="391" skill4Level="1" clanLevel="5" clanReputation="10000" />
<!-- Clan Specialty level 2 -->
<clan mastery="2" skill1Id="19543" skill1Level="2" skill2Id="19544" skill2Level="1" skill3Id="19545" skill3Level="2" skill4Id="19007" skill4Level="1" clanLevel="6" clanReputation="10000" previousMastery="1" />
<!-- Clan Specialty level 3 -->
<clan mastery="3" skill1Id="19543" skill1Level="3" skill2Id="19544" skill2Level="3" skill3Id="19545" skill3Level="3" skill4Id="19112" skill4Level="1" clanLevel="7" clanReputation="10000" previousMastery="2" />
<!-- Clan Specialty level 4 -->
<clan mastery="4" skill1Id="19543" skill1Level="4" skill2Id="19544" skill2Level="4" skill3Id="19545" skill3Level="4" skill4Id="19008" skill4Level="1" clanLevel="11" clanReputation="50000" previousMastery="9" previousMasteryAlt="14" />
<!-- Clan Specialty level 5 -->
<clan mastery="5" skill1Id="19543" skill1Level="5" skill2Id="19544" skill2Level="5" skill3Id="19545" skill3Level="5" clanLevel="14" clanReputation="100000" previousMastery="11" previousMasteryAlt="16" />
<!-- Clan Specialty level 6 -->
<clan mastery="6" skill1Id="19543" skill1Level="6" skill2Id="19544" skill2Level="6" skill3Id="19545" skill3Level="6" skill4Id="19543" skill4Level="4" clanLevel="15" clanReputation="100000" previousMastery="5" />
<!-- Combat Specialty level 1 -->
<clan mastery="7" skill1Id="19531" skill1Level="1" skill2Id="19532" skill2Level="1" clanLevel="8" clanReputation="30000" previousMastery="3" />
<!-- Combat Specialty level 2 -->
<clan mastery="8" skill1Id="19531" skill1Level="2" skill2Id="19532" skill2Level="2" clanLevel="9" clanReputation="30000" previousMastery="7" />
<!-- Combat Specialty level 3 -->
<clan mastery="9" skill1Id="19531" skill1Level="3" skill2Id="19532" skill2Level="3" skill3Id="19533" skill3Level="1" clanLevel="10" clanReputation="30000" previousMastery="8" />
<!-- Combat Specialty level 4 -->
<clan mastery="10" skill1Id="19531" skill1Level="4" skill2Id="19534" skill2Level="1" clanLevel="12" clanReputation="50000" previousMastery="4" />
<!-- Combat Specialty level 5 -->
<clan mastery="11" skill1Id="19534" skill1Level="2" clanLevel="13" clanReputation="50000" previousMastery="10" />
<!-- War Specialty level 1 -->
<clan mastery="12" skill1Id="19013" skill1Level="1" skill2Id="19535" skill2Level="1" clanLevel="8" clanReputation="30000" previousMastery="3" />
<!-- War Specialty level 2 -->
<clan mastery="13" skill1Id="19113" skill1Level="1" skill2Id="19535" skill2Level="2" clanLevel="9" clanReputation="30000" previousMastery="12" />
<!-- War Specialty level 3 -->
<clan mastery="14" skill1Id="19114" skill1Level="1" skill2Id="19535" skill2Level="3" skill3Id="19536" skill3Level="1" clanLevel="10" clanReputation="30000" previousMastery="13" />
<!-- War Specialty level 4 -->
<clan mastery="15" skill1Id="15094" skill1Level="1" skill2Id="19537" skill2Level="1" clanLevel="12" clanReputation="50000" previousMastery="14" />
<!-- War Specialty level 5 -->
<clan mastery="16" skill1Id="19537" skill1Level="2" clanLevel="13" clanReputation="50000" previousMastery="15" />
</list>

View File

@ -84,8 +84,7 @@
<operateType>A2</operateType>
<reuseDelay>1</reuseDelay>
<effects>
<effect name="LimitSkill">
</effect>
<effect name="LimitSkill" />
</effects>
</skill>
<skill id="19527" toLevel="3" name="Limit of Iss">
@ -101,4 +100,480 @@
<effect name="LimitSkill" />
</effects>
</skill>
<skill id="19531" toLevel="4" name="Clan Hunter">
<!-- Clan members' P. Atk. +$s1, M. Atk. +$s2, P. Def. +$s3, and M. Def +$s4. -->
<icon>icon.skill19531</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PAtk">
<amount>
<value level="1">1</value>
<value level="2">2</value>
<value level="3">3</value>
<value level="4">4</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MAtk">
<amount>
<value level="1">1</value>
<value level="2">3</value>
<value level="3">5</value>
<value level="4">7</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="PhysicalDefence">
<amount>
<value level="1">1</value>
<value level="2">2</value>
<value level="3">3</value>
<value level="4">4</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MagicalDefence">
<amount>
<value level="1">1</value>
<value level="2">2</value>
<value level="3">3</value>
<value level="4">4</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19532" toLevel="3" name="Clan Elemental">
<!-- All clan members' defense attributes +$s1. -->
<icon>icon.skill19003</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>FIRE</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>WATER</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>WIND</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>EARTH</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>HOLY</attribute>
</effect>
<effect name="DefenceAttribute">
<amount>
<value level="1">10</value>
<value level="2">20</value>
<value level="3">30</value>
</amount>
<attribute>DARK</attribute>
</effect>
</effects>
</skill>
<skill id="19533" toLevel="1" name="Clan Rating">
<!-- Points gained at the end of the Throne of Heroes Boss Battle +$s1. -->
<icon>icon.skill19533</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
</skill>
<skill id="19534" toLevel="2" name="Clan Barrier">
<!-- Clan members' P. Def and M. Def. +$s1. -->
<icon>icon.skill19534</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PhysicalDefence">
<amount>
<value level="1">3</value>
<value level="2">5</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MagicalDefence">
<amount>
<value level="1">3</value>
<value level="2">5</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19535" toLevel="3" name="Clan Resistance">
<!-- Clan members' Resistance to Stun/ Paralysis/ MEN/ Aerial Yoke/ Knock Back/ Knock Down +$s1. -->
<icon>icon.skill19004</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="DefenceTrait">
<SHOCK>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</SHOCK>
<PARALYZE>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</PARALYZE>
<DERANGEMENT>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</DERANGEMENT>
<AIRBIND>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</AIRBIND>
<KNOCKBACK>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</KNOCKBACK>
<KNOCKDOWN>
<value level="1">10</value>
<value level="2">15</value>
<value level="3">20</value>
</KNOCKDOWN>
</effect>
</effects>
</skill>
<skill id="19536" toLevel="1" name="Clan Battlefield">
<!-- For $s1, Max HP/ MP/ CP +$s2, P. Atk. +$s3, M. Atk. +$s4, and Speed +$s5. Consumes $s6 Spirit Ore. Only available in the battlefield. -->
<icon>icon.skill19536</icon>
<itemConsumeId>3031</itemConsumeId>
<itemConsumeCount>5</itemConsumeCount>
<operateType>A2</operateType>
<targetType>SELF</targetType>
<hitTime>1000</hitTime>
<coolTime>500</coolTime>
<reuseDelay>300000</reuseDelay>
<effectPoint>100</effectPoint>
</skill>
<skill id="19537" toLevel="2" name="Clan Iron">
<!-- Clan members' PVP Damage Received -$s1. -->
<icon>icon.skill0386</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PvpPhysicalAttackDefenceBonus">
<amount>
<value level="1">5</value>
<value level="2">7</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="PvpMagicalSkillDefenceBonus">
<amount>
<value level="1">5</value>
<value level="2">7</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="PvpPhysicalSkillDefenceBonus">
<amount>
<value level="1">5</value>
<value level="2">7</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19538" toLevel="1" name="Clan Vitality">
<!-- Clan members' XP and SP gain +$s1. -->
<icon>icon.skill19538</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="ExpModify">
<amount>10</amount>
<mode>PER</mode>
</effect>
<effect name="SpModify">
<amount>10</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19539" toLevel="1" name="Clan Battle">
<!-- Clan members' P. Atk. +$s1 and M. Atk. +$s2. -->
<icon>icon.skill19539</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PAtk">
<amount>5</amount>
<mode>PER</mode>
</effect>
<effect name="MAtk">
<amount>10</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19540" toLevel="1" name="Clan Blood">
<!-- Clan members' PvE Damage +$s1. -->
<icon>icon.skill19540</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PveMagicalSkillDamageBonus">
<amount>5</amount>
<type>ENEMY_ALL</type>
<mode>PER</mode>
</effect>
<effect name="PvePhysicalAttackDamageBonus">
<amount>5</amount>
<type>ENEMY_ALL</type>
<mode>PER</mode>
</effect>
<effect name="PvePhysicalSkillDamageBonus">
<amount>5</amount>
<type>ENEMY_ALL</type>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19541" toLevel="1" name="Clan Cry">
<!-- Clan members' Skill Power +$s1. -->
<icon>icon.skill19541</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PhysicalSkillPower">
<amount>5</amount>
<mode>PER</mode>
</effect>
<effect name="PhysicalSkillPower">
<amount>5</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19542" toLevel="1" name="Clan Darkness">
<!-- Clan members' PvP Damage +$s1. -->
<icon>icon.skill19542</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PvpPhysicalAttackDamageBonus">
<amount>5</amount>
<mode>PER</mode>
</effect>
<effect name="PvpMagicalSkillDamageBonus">
<amount>5</amount>
<mode>PER</mode>
</effect>
<effect name="PvpPhysicalSkillDamageBonus">
<amount>5</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19543" toLevel="11" name="Clan Combat">
<!-- Clan members' P. Atk. +$s1, M. Atk. +$s2, P. Def. +$s3, and M. Def +$s4. -->
<icon>icon.skill19543</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="PAtk">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">7</value>
<value level="5">9</value>
<value level="6">11</value>
<value level="7">9</value>
<value level="8">10</value>
<value level="9">11</value>
<value level="10">12</value>
<value level="11">13</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MAtk">
<amount>
<value level="1">6</value>
<value level="2">8</value>
<value level="3">10</value>
<value level="4">14</value>
<value level="5">18</value>
<value level="6">22</value>
<value level="7">18</value>
<value level="8">20</value>
<value level="9">22</value>
<value level="10">24</value>
<value level="11">26</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="PhysicalDefence">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">7</value>
<value level="5">9</value>
<value level="6">11</value>
<value level="7">9</value>
<value level="8">10</value>
<value level="9">11</value>
<value level="10">12</value>
<value level="11">13</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MagicalDefence">
<amount>
<value level="1">4</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">7</value>
<value level="5">9</value>
<value level="6">11</value>
<value level="7">9</value>
<value level="8">10</value>
<value level="9">11</value>
<value level="10">12</value>
<value level="11">13</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19544" toLevel="6" name="Clan Will">
<!-- Clan members' XP and SP gain +$s1. -->
<icon>icon.skill19544</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="ExpModify">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="SpModify">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
<skill id="19545" toLevel="6" name="Clan Condition">
<!-- Clan members' Max HP/ MP/ CP +$s1 and HP/ MP/ CP Recovery +$s2. -->
<icon>icon.skill19545</icon>
<operateType>P</operateType>
<targetType>SELF</targetType>
<effects>
<effect name="MaxHp">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MaxMp">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MaxCp">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="HpRegen">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="MpRegen">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
<effect name="CpRegen">
<amount>
<value level="1">3</value>
<value level="2">4</value>
<value level="3">5</value>
<value level="4">6</value>
<value level="5">8</value>
<value level="6">10</value>
</amount>
<mode>PER</mode>
</effect>
</effects>
</skill>
</list>

View File

@ -7,8 +7,14 @@
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:int" name="mastery" use="required"/>
<xs:attribute type="xs:int" name="skilId" use="required"/>
<xs:attribute type="xs:int" name="skillLevel" use="required"/>
<xs:attribute type="xs:int" name="skill1Id" use="required"/>
<xs:attribute type="xs:int" name="skill1Level" use="required"/>
<xs:attribute type="xs:int" name="skill2Id" use="optional"/>
<xs:attribute type="xs:int" name="skill2Level" use="optional"/>
<xs:attribute type="xs:int" name="skill3Id" use="optional"/>
<xs:attribute type="xs:int" name="skill3Level" use="optional"/>
<xs:attribute type="xs:int" name="skill4Id" use="optional"/>
<xs:attribute type="xs:int" name="skill4Level" use="optional"/>
<xs:attribute type="xs:int" name="clanLevel" use="required"/>
<xs:attribute type="xs:int" name="clanReputation" use="required"/>
<xs:attribute type="xs:int" name="previousMastery" use="optional"/>

View File

@ -58,22 +58,56 @@ public class ClanMasteryData implements IGameXmlReader
{
final StatsSet set = new StatsSet(parseAttributes(clanNode));
final int id = set.getInt("mastery");
final int skillId = set.getInt("skilId");
final int skillLevel = set.getInt("skillLevel");
final int skill1Id = set.getInt("skill1Id");
final int skill1Level = set.getInt("skill1Level");
final Skill skill1 = SkillData.getInstance().getSkill(skill1Id, skill1Level);
if (skill1 == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skill1Id + " with level " + skill1Level + " does not exist.");
return;
}
final int skill2Id = set.getInt("skill2Id", 0);
final int skill2Level = set.getInt("skill2Level", 0);
Skill skill2 = null;
if (skill2Id > 0)
{
skill2 = SkillData.getInstance().getSkill(skill2Id, skill2Level);
if (skill2 == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skill2Id + " with level " + skill2Level + " does not exist.");
return;
}
}
final int skill3Id = set.getInt("skill3Id", 0);
final int skill3Level = set.getInt("skill3Level", 0);
Skill skill3 = null;
if (skill3Id > 0)
{
skill3 = SkillData.getInstance().getSkill(skill3Id, skill3Level);
if (skill3 == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skill3Id + " with level " + skill3Level + " does not exist.");
return;
}
}
final int skill4Id = set.getInt("skill4Id", 0);
final int skill4Level = set.getInt("skill4Level", 0);
Skill skill4 = null;
if (skill4Id > 0)
{
skill4 = SkillData.getInstance().getSkill(skill4Id, skill4Level);
if (skill4 == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skill4Id + " with level " + skill4Level + " does not exist.");
return;
}
}
final int clanLevel = set.getInt("clanLevel");
final int clanReputation = set.getInt("clanReputation");
final int previousMastery = set.getInt("previousMastery", 0);
final int previousMasteryAlt = set.getInt("previousMasteryAlt", 0);
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skillId + " with level " + skillLevel + " does not exist.");
}
else
{
_clanMasteryData.add(new ClanMasteryHolder(id, skill, clanLevel, clanReputation, previousMastery, previousMasteryAlt));
}
_clanMasteryData.add(new ClanMasteryHolder(id, skill1, skill2, skill3, skill4, clanLevel, clanReputation, previousMastery, previousMasteryAlt));
}));
}

View File

@ -16,6 +16,9 @@
*/
package com.l2jmobius.gameserver.model.holders;
import java.util.ArrayList;
import java.util.List;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
@ -24,20 +27,32 @@ import com.l2jmobius.gameserver.model.skills.Skill;
public class ClanMasteryHolder
{
private final int _id;
private final Skill _skill;
private final List<Skill> _skills = new ArrayList<>();
private final int _clanLevel;
private final int _clanReputation;
private final int _previousMastery;
private final int _previousMasteryAlt;
public ClanMasteryHolder(int id, Skill skill, int clanLevel, int clanReputation, int previousMastery, int previousMasteryAlt)
public ClanMasteryHolder(int id, Skill skill1, Skill skill2, Skill skill3, Skill skill4, int clanLevel, int clanReputation, int previousMastery, int previousMasteryAlt)
{
_id = id;
_skill = skill;
_clanLevel = clanLevel;
_clanReputation = clanReputation;
_previousMastery = previousMastery;
_previousMasteryAlt = previousMasteryAlt;
_skills.add(skill1);
if (skill2 != null)
{
_skills.add(skill2);
}
if (skill3 != null)
{
_skills.add(skill3);
}
if (skill4 != null)
{
_skills.add(skill4);
}
}
public int getId()
@ -45,9 +60,9 @@ public class ClanMasteryHolder
return _id;
}
public Skill getSkill()
public List<Skill> getSkills()
{
return _skill;
return _skills;
}
public int getClanLevel()