lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of missing clan mastery skills.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

56
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java
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));
}));
}

25
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/holders/ClanMasteryHolder.java
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()