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

Reverted the specialty naming.

Browse Source
This commit is contained in:
MobiusDev
2019-02-16 09:52:59 +00:00
parent dacb94f13a
commit 271de4803a
14 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_5.0_Salvation/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();
ClanSpecialtyData.getInstance();
ClanMasteryData.getInstance();
ClanShopData.getInstance();
printSection("Geodata");

34
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanSpecialtyData.java → L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/ClanMasteryData.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.ClanSpecialtyHolder;
import com.l2jmobius.gameserver.model.holders.ClanMasteryHolder;
import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author Mobius
*/
public class ClanSpecialtyData implements IGameXmlReader
public class ClanMasteryData implements IGameXmlReader
{
private static Logger LOGGER = Logger.getLogger(ClanSpecialtyData.class.getName());
private static Logger LOGGER = Logger.getLogger(ClanMasteryData.class.getName());
private final List<ClanSpecialtyHolder> _clanSpecialtyData = new ArrayList<>();
private final List<ClanMasteryHolder> _clanMasteryData = new ArrayList<>();
protected ClanSpecialtyData()
protected ClanMasteryData()
{
load();
}
@ -45,10 +45,10 @@ public class ClanSpecialtyData implements IGameXmlReader
@Override
public void load()
{
_clanSpecialtyData.clear();
_clanMasteryData.clear();
parseDatapackFile("data/ClanSpecialtyData.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _clanSpecialtyData.size() + " clan specialties.");
parseDatapackFile("data/ClanMasteryData.xml");
LOGGER.info(getClass().getSimpleName() + ": Loaded " + _clanMasteryData.size() + " clan masteries.");
}
@Override
@ -57,38 +57,38 @@ public class ClanSpecialtyData implements IGameXmlReader
forEach(doc, "list", listNode -> forEach(listNode, "clan", clanNode ->
{
final StatsSet set = new StatsSet(parseAttributes(clanNode));
final int id = set.getInt("specialty");
final int id = set.getInt("mastery");
final int skillId = set.getInt("skilId");
final int skillLevel = set.getInt("skillLevel");
final int clanLevel = set.getInt("clanLevel");
final int clanReputation = set.getInt("clanReputation");
final int previousSpecialty = set.getInt("previousSpecialty", 0);
final int previousSpecialtyAlt = set.getInt("previousSpecialtyAlt", 0);
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 specialty, skill id " + skillId + " with level " + skillLevel + " does not exist.");
LOGGER.info(getClass().getSimpleName() + ": Could not create clan mastery, skill id " + skillId + " with level " + skillLevel + " does not exist.");
}
else
{
_clanSpecialtyData.add(new ClanSpecialtyHolder(id, skill, clanLevel, clanReputation, previousSpecialty, previousSpecialtyAlt));
_clanMasteryData.add(new ClanMasteryHolder(id, skill, clanLevel, clanReputation, previousMastery, previousMasteryAlt));
}
}));
}
public List<ClanSpecialtyHolder> getSpecialties()
public List<ClanMasteryHolder> getMasteries()
{
return _clanSpecialtyData;
return _clanMasteryData;
}
public static ClanSpecialtyData getInstance()
public static ClanMasteryData getInstance()
{
return SingletonHolder._instance;
}
private static class SingletonHolder
{
protected static final ClanSpecialtyData _instance = new ClanSpecialtyData();
protected static final ClanMasteryData _instance = new ClanMasteryData();
}
}

20
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/holders/ClanSpecialtyHolder.java → L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/holders/ClanMasteryHolder.java
View File

@ -21,23 +21,23 @@ import com.l2jmobius.gameserver.model.skills.Skill;
/**
* @author Mobius
*/
public class ClanSpecialtyHolder
public class ClanMasteryHolder
{
private final int _id;
private final Skill _skill;
private final int _clanLevel;
private final int _clanReputation;
private final int _previousSpecialty;
private final int _previousSpecialtyAlt;
private final int _previousMastery;
private final int _previousMasteryAlt;
public ClanSpecialtyHolder(int id, Skill skill, int clanLevel, int clanReputation, int previousSpecialty, int previousSpecialtyAlt)
public ClanMasteryHolder(int id, Skill skill, int clanLevel, int clanReputation, int previousMastery, int previousMasteryAlt)
{
_id = id;
_skill = skill;
_clanLevel = clanLevel;
_clanReputation = clanReputation;
_previousSpecialty = previousSpecialty;
_previousSpecialtyAlt = previousSpecialtyAlt;
_previousMastery = previousMastery;
_previousMasteryAlt = previousMasteryAlt;
}
public int getId()
@ -60,13 +60,13 @@ public class ClanSpecialtyHolder
return _clanReputation;
}
public int getPreviousSpecialty()
public int getPreviousMastery()
{
return _previousSpecialty;
return _previousMastery;
}
public int getPreviousSpecialtyAlt()
public int getPreviousMasteryAlt()
{
return _previousSpecialtyAlt;
return _previousMasteryAlt;
}
}

12
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMasteryInfo.java
View File

@ -17,9 +17,9 @@
package com.l2jmobius.gameserver.network.serverpackets.pledgeV2;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.data.xml.impl.ClanSpecialtyData;
import com.l2jmobius.gameserver.data.xml.impl.ClanMasteryData;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.holders.ClanSpecialtyHolder;
import com.l2jmobius.gameserver.model.holders.ClanMasteryHolder;
import com.l2jmobius.gameserver.network.OutgoingPackets;
import com.l2jmobius.gameserver.network.serverpackets.AbstractItemPacket;
@ -49,13 +49,13 @@ public class ExPledgeMasteryInfo extends AbstractItemPacket
packet.writeD(Math.max(0, _player.getClan().getLevel() - 4)); // Total development points
packet.writeD(16); // Masteries count
for (ClanSpecialtyHolder specialty : ClanSpecialtyData.getInstance().getSpecialties())
for (ClanMasteryHolder mastery : ClanMasteryData.getInstance().getMasteries())
{
if (specialty.getId() < 17)
if (mastery.getId() < 17)
{
packet.writeD(specialty.getId()); // Mastery
packet.writeD(mastery.getId()); // Mastery
packet.writeD(0); // Purchased?
packet.writeC(/* _player.getClan().getLevel() >= specialty.getClanLevel() ? 1 : */ 0); // Availability - TODO: Previous level requirement.
packet.writeC(/* _player.getClan().getLevel() >= mastery.getClanLevel() ? 1 : */ 0); // Availability - TODO: Previous level requirement.
}
}