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

Proper clan specialty data holder.

Browse Source
This commit is contained in:
MobiusDev
2019-02-15 05:33:27 +00:00
parent b8cb4750b0
commit a6388b2df9
12 changed files with 160 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/GameServer.java
View File

@@ -50,9 +50,9 @@ import com.l2jmobius.gameserver.data.xml.impl.BeautyShopData;
import com.l2jmobius.gameserver.data.xml.impl.BuyListData;
import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
import com.l2jmobius.gameserver.data.xml.impl.ClanHallData;
import com.l2jmobius.gameserver.data.xml.impl.ClanMasteryData;
import com.l2jmobius.gameserver.data.xml.impl.ClanRewardData;
import com.l2jmobius.gameserver.data.xml.impl.ClanShopData;
import com.l2jmobius.gameserver.data.xml.impl.ClanSpecialtyData;
import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
import com.l2jmobius.gameserver.data.xml.impl.CombinationItemsData;
import com.l2jmobius.gameserver.data.xml.impl.CubicData;
@@ -307,7 +307,7 @@ public class GameServer
ClanHallData.getInstance();
ClanHallAuctionManager.getInstance();
ClanEntryManager.getInstance();
ClanMasteryData.getInstance();
ClanSpecialtyData.getInstance();
ClanShopData.getInstance();
printSection("Geodata");

39
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.java → L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/ClanSpecialtyData.java
View File

@@ -25,19 +25,19 @@ import org.w3c.dom.Document;
import com.l2jmobius.commons.util.IGameXmlReader;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.holders.ClanMasteryHolder;
import com.l2jmobius.gameserver.model.holders.ClanSpecialtyHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author Mobius
*/
public class ClanMasteryData implements IGameXmlReader
public class ClanSpecialtyData implements IGameXmlReader
{
private static Logger LOGGER = Logger.getLogger(ClanMasteryData.class.getName());
private static Logger LOGGER = Logger.getLogger(ClanSpecialtyData.class.getName());
private final List<ClanMasteryHolder> _clanMasteryData = new ArrayList<>();
private final List<ClanSpecialtyHolder> _clanSpecialtyData = new ArrayList<>();
protected ClanMasteryData()
protected ClanSpecialtyData()
{
load();
}
@@ -45,10 +45,10 @@ public class ClanMasteryData implements IGameXmlReader
@Override
public void load()
{
_clanMasteryData.clear();
_clanSpecialtyData.clear();
parseDatapackFile("data/ClanMasteryData.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _clanMasteryData.size() + " clan masteries.");
parseDatapackFile("data/ClanSpecialtyData.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _clanSpecialtyData.size() + " clan specialties.");
}
@Override
@@ -57,34 +57,37 @@ public class ClanMasteryData implements IGameXmlReader
forEach(doc, "list", listNode -> forEach(listNode, "clan", clanNode ->
{
final StatsSet set = new StatsSet(parseAttributes(clanNode));
final int mastery = set.getInt("mastery");
final int level = set.getInt("level");
final int previous = set.getInt("previous");
final int id = set.getInt("specialty");
final int skillId = set.getInt("skilId");
final int skillLevel = set.getInt("skillLevel");
final int clanLevel = set.getInt("clanLevel");
final int previousSpecialty = set.getInt("previousSpecialty");
final int previousSpecialtyAlt = set.getInt("previousSpecialtyAlt");
final Skill skill = SkillData.getInstance().getSkill(mastery, level);
final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel);
if (skill == null)
{
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + mastery + " with level " + level + " does not exist.");
LOGGER.info(getClass().getSimpleName() + ": Could not create clan specialty, skill id " + skillId + " with level " + skillLevel + " does not exist.");
}
else
{
_clanMasteryData.add(new ClanMasteryHolder(skill, previous));
_clanSpecialtyData.add(new ClanSpecialtyHolder(id, skill, clanLevel, previousSpecialty, previousSpecialtyAlt));
}
}));
}
public List<ClanMasteryHolder> getMasteries()
public List<ClanSpecialtyHolder> getSpecialties()
{
return _clanMasteryData;
return _clanSpecialtyData;
}
public static ClanMasteryData getInstance()
public static ClanSpecialtyData getInstance()
{
return SingletonHolder._instance;
}
private static class SingletonHolder
{
protected static final ClanMasteryData _instance = new ClanMasteryData();
protected static final ClanSpecialtyData _instance = new ClanSpecialtyData();
}
}

33
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/holders/ClanMasteryHolder.java → L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/holders/ClanSpecialtyHolder.java
View File

@@ -21,15 +21,26 @@ import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author Mobius
*/
public class ClanMasteryHolder
public class ClanSpecialtyHolder
{
private final int _id;
private final Skill _skill;
private final int _previousSkillId;
private final int _clanLevel;
private final int _previousSpecialty;
private final int _previousSpecialtyAlt;
public ClanMasteryHolder(Skill skill, int previousSkillId)
public ClanSpecialtyHolder(int id, Skill skill, int clanLevel, int previousSpecialty, int previousSpecialtyAlt)
{
_id = id;
_skill = skill;
_previousSkillId = previousSkillId;
_clanLevel = clanLevel;
_previousSpecialty = previousSpecialty;
_previousSpecialtyAlt = previousSpecialtyAlt;
}
public int getId()
{
return _id;
}
public Skill getSkill()
@@ -37,8 +48,18 @@ public class ClanMasteryHolder
return _skill;
}
public int getPreviousSkillId()
public int getClanLevel()
{
return _previousSkillId;
return _clanLevel;
}
public int getPreviousSpecialty()
{
return _previousSpecialty;
}
public int getPreviousSpecialtyAlt()
{
return _previousSpecialtyAlt;
}
}