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

Addition of exalted noble status.

Browse Source
This commit is contained in:
MobiusDev
2017-10-15 01:35:17 +00:00
parent 77411e1e89
commit f67b7dbd1a
70 changed files with 138 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@@ -64,7 +64,7 @@ public final class SiegeManager
public final void addSiegeSkills(L2PcInstance character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
{
character.addSkill(sk, false);
}
@@ -110,7 +110,7 @@ public final class SiegeManager
public final void removeSiegeSkills(L2PcInstance character)
{
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.isNoble(), character.getClan().getCastleId() > 0))
for (Skill sk : SkillData.getInstance().getSiegeSkills(character.getNobleLevel() > 0, character.getClan().getCastleId() > 0))
{
character.removeSkill(sk);
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java
View File

@@ -486,7 +486,7 @@ public class L2Clan implements IIdentifiable, INamable
if (exMember.isOnline())
{
final L2PcInstance player = exMember.getPlayerInstance();
if (!player.isNoble())
if (player.getNobleLevel() == 0)
{
player.setTitle("");
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2ClanMember.java
View File

@@ -801,7 +801,7 @@ public class L2ClanMember
}
}
if (player.isNoble() && (pledgeClass < 5))
if ((player.getNobleLevel() > 0) && (pledgeClass < 5))
{
pledgeClass = 5;
}

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Attackable.java
View File

@@ -406,7 +406,7 @@ public class L2Attackable extends L2Npc
p.increaseRaidbossPoints(points);
p.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_RAID_POINT_S).addInt(points));
if (p.isNoble())
if (p.getNobleLevel() > 0)
{
Hero.getInstance().setRBkilled(p.getObjectId(), getId());
}
@@ -417,7 +417,7 @@ public class L2Attackable extends L2Npc
final int points = Math.max(raidbossPoints, 1);
player.increaseRaidbossPoints(points);
player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_EARNED_S1_RAID_POINT_S).addInt(points));
if (player.isNoble())
if (player.getNobleLevel() > 0)
{
Hero.getInstance().setRBkilled(player.getObjectId(), getId());
}

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Npc.java
View File

@@ -750,7 +750,7 @@ public class L2Npc extends L2Character
{
case 31688:
{
if (player.isNoble())
if (player.getNobleLevel() > 0)
{
filename = Olympiad.OLYMPIAD_HTML_PATH + "noble_main.htm";
}
@@ -766,7 +766,7 @@ public class L2Npc extends L2Character
case 31771:
case 31772:
{
if (player.isHero() || player.isNoble())
if (player.isHero() || (player.getNobleLevel() > 0))
{
filename = Olympiad.OLYMPIAD_HTML_PATH + "hero_main.htm";
}

29
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -564,7 +564,7 @@ public final class L2PcInstance extends L2Playable
// Multisell
private PreparedListContainer _currentMultiSell = null;
private boolean _noble = false;
private int _nobleLevel = 0;
private boolean _hero = false;
private boolean _trueHero = false;
@@ -2557,9 +2557,9 @@ public final class L2PcInstance extends L2Playable
// Do not call this on enterworld or char load
// Add noble skills if noble
if (isNoble())
if (_nobleLevel > 0)
{
setNoble(true);
setNoble(_nobleLevel);
}
// Add Hero skills if hero
@@ -6516,7 +6516,7 @@ public final class L2PcInstance extends L2Playable
statement.setInt(30, getClanPrivileges().getBitmask());
statement.setInt(31, getWantsPeace());
statement.setInt(32, getBaseClass());
statement.setInt(33, isNoble() ? 1 : 0);
statement.setInt(33, _nobleLevel);
statement.setLong(34, 0);
statement.setInt(35, PcStat.MIN_VITALITY_POINTS);
statement.setDate(36, new Date(getCreateDate().getTimeInMillis()));
@@ -6578,7 +6578,8 @@ public final class L2PcInstance extends L2Playable
player.setPvpKills(rset.getInt("pvpkills"));
player.setPkKills(rset.getInt("pkkills"));
player.setOnlineTime(rset.getLong("onlinetime"));
player.setNoble(rset.getInt("nobless") == 1);
final int nobleLevel = rset.getInt("nobless");
player.setNoble(nobleLevel);
final int factionId = rset.getInt("faction");
if (factionId == 1)
@@ -6636,7 +6637,7 @@ public final class L2PcInstance extends L2Playable
}
else
{
if (player.isNoble())
if (nobleLevel > 0)
{
player.setPledgeClass(5);
}
@@ -7164,7 +7165,7 @@ public final class L2PcInstance extends L2Playable
}
statement.setLong(34, totalOnlineTime);
statement.setInt(35, isNoble() ? 1 : 0);
statement.setInt(35, _nobleLevel);
statement.setInt(36, getPowerGrade());
statement.setInt(37, getPledgeType());
statement.setInt(38, getLvlJoinedAcademy());
@@ -8456,7 +8457,7 @@ public final class L2PcInstance extends L2Playable
}
case STRIDER: // Strider
{
if (isNoble())
if (_nobleLevel > 0)
{
addSkill(CommonSkill.STRIDER_SIEGE_ASSAULT.getSkill(), false);
}
@@ -9328,15 +9329,15 @@ public final class L2PcInstance extends L2Playable
return true;
}
public boolean isNoble()
public int getNobleLevel()
{
return _noble;
return _nobleLevel;
}
public void setNoble(boolean val)
public void setNoble(int level)
{
final Collection<Skill> nobleSkillTree = SkillTreesData.getInstance().getNobleSkillTree().values();
if (val)
if (level != 0)
{
for (Skill skill : nobleSkillTree)
{
@@ -9351,10 +9352,10 @@ public final class L2PcInstance extends L2Playable
}
}
_noble = val;
_nobleLevel = level;
sendSkillList();
if (val && (getLevel() >= 99))
if ((level != 0) && (getLevel() >= 99))
{
sendPacket(new ExAcquireAPSkillList(this));
}

8
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2TeleporterInstance.java
View File

@@ -80,7 +80,7 @@ public final class L2TeleporterInstance extends L2Npc
case "showNoblesSelect":
{
final NpcHtmlMessage msg = new NpcHtmlMessage(getObjectId());
msg.setFile(player.getHtmlPrefix(), "data/html/teleporter/" + (player.isNoble() ? "nobles_select" : "not_nobles") + ".htm");
msg.setFile(player.getHtmlPrefix(), "data/html/teleporter/" + (player.getNobleLevel() > 0 ? "nobles_select" : "not_nobles") + ".htm");
msg.replace("%objectId%", getObjectId());
player.sendPacket(msg);
break;
@@ -88,7 +88,7 @@ public final class L2TeleporterInstance extends L2Npc
case "showTeleports":
{
final TeleportType type = parseTeleportType(st);
if (((type == TeleportType.NOBLES_TOKEN) || (type == TeleportType.NOBLES_ADENA)) && !player.isNoble())
if (((type == TeleportType.NOBLES_TOKEN) || (type == TeleportType.NOBLES_ADENA)) && (player.getNobleLevel() == 0))
{
_log.warning(player + " attempted to use nobles teleport without being nobles!");
break;
@@ -148,7 +148,7 @@ public final class L2TeleporterInstance extends L2Npc
}
final TeleportType type = TeleportType.values()[typeId];
if (((type == TeleportType.NOBLES_TOKEN) || (type == TeleportType.NOBLES_ADENA)) && !player.isNoble())
if (((type == TeleportType.NOBLES_TOKEN) || (type == TeleportType.NOBLES_ADENA)) && (player.getNobleLevel() == 0))
{
_log.warning(player + " attempted to use nobles teleport without being nobles!");
break;
@@ -481,7 +481,7 @@ public final class L2TeleporterInstance extends L2Npc
player.sendPacket(SystemMessageId.YOU_CANNOT_TELEPORT_WHILE_IN_POSSESSION_OF_A_WARD);
return;
}
else if (list.getIsForNoble() && !player.isNoble())
else if (list.getIsForNoble() && (player.getNobleLevel() == 0))
{
final String filename = "data/html/teleporter/nobleteleporter-no.htm";
final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
View File

@@ -294,7 +294,7 @@ public class PcStat extends PlayableStat
// Send acquirable skill list
getActiveChar().sendPacket(new AcquireSkillList(getActiveChar()));
getActiveChar().sendPacket(new ExVoteSystemInfo(getActiveChar()));
if ((getLevel() >= 99) && getActiveChar().isNoble())
if ((getLevel() >= 99) && (getActiveChar().getNobleLevel() > 0))
{
getActiveChar().sendPacket(new ExAcquireAPSkillList(getActiveChar()));
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/entity/Siege.java
View File

@@ -271,7 +271,7 @@ public class Siege implements Siegable
if (member != null)
{
final L2PcInstance player = member.getPlayerInstance();
if ((player != null) && player.isNoble())
if ((player != null) && (player.getNobleLevel() > 0))
{
Hero.getInstance().setCastleTaken(player.getObjectId(), getCastle().getResidenceId());
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/olympiad/OlympiadManager.java
View File

@@ -269,7 +269,7 @@ public class OlympiadManager
return false;
}
if (!noble.isNoble())
if (noble.getNobleLevel() == 0)
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DOES_NOT_MEET_THE_PARTICIPATION_REQUIREMENTS_ONLY_NOBLESSE_EXALTED_CHARACTERS_CAN_PARTICIPATE_IN_THE_OLYMPIAD);
sm.addString(noble.getName());

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestGiveNickName.java
View File

@@ -46,7 +46,7 @@ public class RequestGiveNickName implements IClientIncomingPacket
}
// Noblesse can bestow a title to themselves
if (activeChar.isNoble() && _target.equalsIgnoreCase(activeChar.getName()))
if ((activeChar.getNobleLevel() > 0) && _target.equalsIgnoreCase(activeChar.getName()))
{
activeChar.setTitle(_title);
client.sendPacket(SystemMessageId.YOUR_TITLE_HAS_BEEN_CHANGED);

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityList.java
View File

@@ -48,7 +48,7 @@ public class RequestAbilityList implements IClientIncomingPacket
return;
}
if ((activeChar.getLevel() < 99) || !activeChar.isNoble())
if ((activeChar.getLevel() < 99) || (activeChar.getNobleLevel() == 0))
{
activeChar.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndClose.java
View File

@@ -44,7 +44,7 @@ public class RequestAbilityWndClose implements IClientIncomingPacket
return;
}
if ((activeChar.getLevel() < 99) || !activeChar.isNoble())
if ((activeChar.getLevel() < 99) || (activeChar.getNobleLevel() == 0))
{
activeChar.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAbilityWndOpen.java
View File

@@ -44,7 +44,7 @@ public class RequestAbilityWndOpen implements IClientIncomingPacket
return;
}
if ((activeChar.getLevel() < 99) || !activeChar.isNoble())
if ((activeChar.getLevel() < 99) || (activeChar.getNobleLevel() == 0))
{
activeChar.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestAcquireAbilityList.java
View File

@@ -90,7 +90,7 @@ public class RequestAcquireAbilityList implements IClientIncomingPacket
return;
}
if ((activeChar.getLevel() < 99) || !activeChar.isNoble())
if ((activeChar.getLevel() < 99) || (activeChar.getNobleLevel() == 0))
{
activeChar.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestChangeAbilityPoint.java
View File

@@ -54,7 +54,7 @@ public class RequestChangeAbilityPoint implements IClientIncomingPacket
return;
}
if ((activeChar.getLevel() < 99) || !activeChar.isNoble())
if ((activeChar.getLevel() < 99) || (activeChar.getNobleLevel() == 0))
{
activeChar.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/ability/RequestResetAbilityPoint.java
View File

@@ -58,7 +58,7 @@ public class RequestResetAbilityPoint implements IClientIncomingPacket
{
return;
}
else if ((activeChar.getLevel() < 99) || !activeChar.isNoble())
else if ((activeChar.getLevel() < 99) || (activeChar.getNobleLevel() == 0))
{
client.sendPacket(SystemMessageId.ABILITIES_CAN_BE_USED_BY_NOBLESSE_EXALTED_LV_99_OR_ABOVE);
return;

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/CharInfo.java
View File

@@ -201,7 +201,7 @@ public class CharInfo implements IClientOutgoingPacket
packet.writeC(_activeChar.getTeam().getId()); // Confirmed
packet.writeD(_activeChar.getClanCrestLargeId());
packet.writeC(_activeChar.isNoble() ? 1 : 0); // Confirmed
packet.writeC(_activeChar.getNobleLevel()); // Confirmed
packet.writeC(_activeChar.isHero() || (_activeChar.isGM() && Config.GM_HERO_AURA) ? 1 : 0); // Confirmed
packet.writeC(_activeChar.isFishing() ? 1 : 0); // Confirmed

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/GMViewCharacterInfo.java
View File

@@ -154,7 +154,7 @@ public class GMViewCharacterInfo implements IClientOutgoingPacket
packet.writeD(_activeChar.getPledgeClass()); // changes the text above CP on Status Window
packet.writeC(_activeChar.isNoble() ? 0x01 : 0x00);
packet.writeC(_activeChar.getNobleLevel());
packet.writeC(_activeChar.isHero() ? 0x01 : 0x00);
packet.writeD(_activeChar.getAppearance().getNameColor());

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/UserInfo.java
View File

@@ -303,7 +303,7 @@ public class UserInfo extends AbstractMaskPacket<UserInfoType>
packet.writeH(22);
packet.writeC(_activeChar.getPvpFlag());
packet.writeD(_activeChar.getReputation()); // Reputation
packet.writeC(_activeChar.isNoble() ? 0x01 : 0x00);
packet.writeC(_activeChar.getNobleLevel());
packet.writeC(_activeChar.isHero() || (_activeChar.isGM() && Config.GM_HERO_AURA) ? 1 : 0);
packet.writeC(_activeChar.getPledgeClass());
packet.writeD(_activeChar.getPkKills());

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ability/ExAcquireAPSkillList.java
View File

@@ -55,7 +55,7 @@ public class ExAcquireAPSkillList implements IClientOutgoingPacket
}
}
}
_enable = (!activeChar.isSubClassActive() || activeChar.isDualClassActive()) && (activeChar.getLevel() >= 99) && activeChar.isNoble();
_enable = (!activeChar.isSubClassActive() || activeChar.isDualClassActive()) && (activeChar.getLevel() >= 99) && (activeChar.getNobleLevel() > 0);
}
@Override