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_2.5_Underground/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@@ -256,7 +256,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
case "setnoble":
{
if (player.isNoble())
if (player.getNobleLevel() > 0)
{
htmltext = "test_server_helper025b.html";
}
@@ -266,7 +266,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
}
else
{
player.setNoble(true);
player.setNoble(1);
player.broadcastUserInfo();
// TODO: SetOneTimeQuestFlag(talker, 10385, 1);
htmltext = "test_server_helper025.html";

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java vendored
View File

@@ -254,7 +254,7 @@ public final class MonumentOfHeroes extends AbstractNpcAI
@Override
public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
return player.isNoble() ? "MonumentOfHeroes-noblesse.html" : "MonumentOfHeroes-noNoblesse.html";
return player.getNobleLevel() > 0 ? "MonumentOfHeroes-noblesse.html" : "MonumentOfHeroes-noNoblesse.html";
}
private int getOlympiadRank(L2PcInstance player)

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/OlyManager/OlyManager.java vendored
View File

@@ -311,7 +311,7 @@ public final class OlyManager extends AbstractNpcAI implements IBypassHandler
if (!player.isCursedWeaponEquipped())
{
htmltext = player.isNoble() ? "OlyManager-noble.html" : "OlyManager-noNoble.html";
htmltext = player.getNobleLevel() > 0 ? "OlyManager-noble.html" : "OlyManager-noNoble.html";
}
else
{

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/custom/FactionSystem/FactionSystem.java vendored
View File

@@ -76,7 +76,7 @@ public final class FactionSystem extends AbstractNpcAI
}
if (Config.FACTION_AUTO_NOBLESS)
{
player.setNoble(true);
player.setNoble(1);
}
player.setGood();
player.getAppearance().setNameColor(Config.FACTION_GOOD_NAME_COLOR);
@@ -103,7 +103,7 @@ public final class FactionSystem extends AbstractNpcAI
}
if (Config.FACTION_AUTO_NOBLESS)
{
player.setNoble(true);
player.setNoble(1);
}
player.setEvil();
player.getAppearance().setNameColor(Config.FACTION_EVIL_NAME_COLOR);

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -860,7 +860,8 @@ public class AdminEditChar implements IAdminCommandHandler
if (player != null)
{
player.setNoble(!player.isNoble());
final int nobleLevel = player.getNobleLevel();
player.setNoble(nobleLevel == 2 ? 0 : nobleLevel + 1);
if (player.getObjectId() != activeChar.getObjectId())
{
activeChar.sendMessage("You've changed nobless status of: " + player.getName());
@@ -1169,7 +1170,8 @@ public class AdminEditChar implements IAdminCommandHandler
adminReply.replace("%hwid%", (player.getClient() != null) && (player.getClient().getHardwareInfo() != null) ? player.getClient().getHardwareInfo().getMacAddress() : "Unknown");
adminReply.replace("%ai%", player.getAI().getIntention().name());
adminReply.replace("%inst%", player.isInInstance() ? "<tr><td>InstanceId:</td><td><a action=\"bypass -h admin_instance_spawns " + player.getInstanceId() + "\">" + player.getInstanceId() + "</a></td></tr>" : "");
adminReply.replace("%noblesse%", player.isNoble() ? "Yes" : "No");
final int nobleLevel = player.getNobleLevel();
adminReply.replace("%noblesse%", nobleLevel == 0 ? "No" : nobleLevel == 1 ? "Noble" : "Exalted");
activeChar.sendPacket(adminReply);
}

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminOlympiad.java vendored
View File

@@ -111,7 +111,7 @@ public class AdminOlympiad implements IAdminCommandHandler
return false;
}
if (player.isNoble())
if (player.getNobleLevel() > 0)
{
final StatsSet statDat = getPlayerSet(player);
final int oldpoints = Olympiad.getInstance().getNoblePoints(player);
@@ -152,7 +152,7 @@ public class AdminOlympiad implements IAdminCommandHandler
return false;
}
if (player.isNoble())
if (player.getNobleLevel() > 0)
{
final StatsSet playerStat = Olympiad.getNobleStats(player.getObjectId());
if (playerStat == null)
@@ -194,7 +194,7 @@ public class AdminOlympiad implements IAdminCommandHandler
return false;
}
if (player.isNoble())
if (player.getNobleLevel() > 0)
{
final StatsSet statDat = getPlayerSet(player);
final int oldpoints = Olympiad.getInstance().getNoblePoints(player);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/OlympiadStat.java vendored
View File

@@ -44,7 +44,7 @@ public class OlympiadStat implements IUserCommandHandler
final int nobleObjId = activeChar.getObjectId();
final L2Object target = activeChar.getTarget();
if ((target == null) || !target.isPlayer() || !target.getActingPlayer().isNoble())
if ((target == null) || !target.isPlayer() || (target.getActingPlayer().getNobleLevel() == 0))
{
activeChar.sendPacket(SystemMessageId.THIS_COMMAND_CAN_ONLY_BE_USED_WHEN_THE_TARGET_IS_AN_AWAKENED_NOBLESSE_EXALTED);
return false;

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/usercommandhandlers/SiegeStatus.java vendored
View File

@@ -46,7 +46,7 @@ public class SiegeStatus implements IUserCommandHandler
return false;
}
if (!activeChar.isNoble() || !activeChar.isClanLeader())
if ((activeChar.getNobleLevel() == 0) || !activeChar.isClanLeader())
{
activeChar.sendPacket(SystemMessageId.ONLY_A_CLAN_LEADER_THAT_IS_A_NOBLESSE_EXALTED_CAN_VIEW_THE_SIEGE_WAR_STATUS_WINDOW_DURING_A_SIEGE_WAR);
return false;

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java vendored
View File

@@ -222,7 +222,7 @@ public class Q00551_OlympiadStarter extends Quest
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if ((player.getLevel() < 75) || !player.isNoble())
if ((player.getLevel() < 75) || (player.getNobleLevel() == 0))
{
htmltext = "31688-00.htm";
}
@@ -235,7 +235,7 @@ public class Q00551_OlympiadStarter extends Quest
if (qs.isNowAvailable())
{
qs.setState(State.CREATED);
htmltext = (player.getLevel() < 75) || !player.isNoble() ? "31688-00.htm" : "31688-01.htm";
htmltext = (player.getLevel() < 75) || (player.getNobleLevel() == 0) ? "31688-00.htm" : "31688-01.htm";
}
else
{

4
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java vendored
View File

@@ -156,7 +156,7 @@ public class Q00553_OlympiadUndefeated extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if ((player.getLevel() < 75) || !player.isNoble())
if ((player.getLevel() < 75) || (player.getNobleLevel() == 0))
{
htmltext = "31688-00.htm";
}
@@ -169,7 +169,7 @@ public class Q00553_OlympiadUndefeated extends Quest
if (qs.isNowAvailable())
{
qs.setState(State.CREATED);
htmltext = (player.getLevel() < 75) || !player.isNoble() ? "31688-00.htm" : "31688-01.htm";
htmltext = (player.getLevel() < 75) || (player.getNobleLevel() == 0) ? "31688-00.htm" : "31688-01.htm";
}
else
{

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java vendored
View File

@@ -361,7 +361,7 @@ public final class Q10369_NoblesseSoulTesting extends Quest
{
player.doCast(NOBLESSE_PRESENTATION.getSkill());
showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 5000);
player.setNoble(true);
player.setNoble(1);
player.broadcastUserInfo();
giveItems(player, DIMENSIONAL_DIAMOND, 10);
giveItems(player, NOBLESSE_TIARA, 1);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java vendored
View File

@@ -98,7 +98,7 @@ public final class Q10461_TappingThePowerWithin extends Quest
{
case State.CREATED:
{
if (((player.getLevel() >= MIN_LEVEL) && player.isNoble()))
if (((player.getLevel() >= MIN_LEVEL) && (player.getNobleLevel() > 0)))
{
htmltext = "33907-01.htm";
break;

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10811_ExaltedOneWhoFacesTheLimit/Q10811_ExaltedOneWhoFacesTheLimit.java vendored
View File

@@ -119,7 +119,7 @@ public final class Q10811_ExaltedOneWhoFacesTheLimit extends Quest
{
case State.CREATED:
{
htmltext = (player.getLevel() >= MIN_LEVEL) && player.isNoble() ? "33383-01.htm" : "33383-07.htm";
htmltext = (player.getLevel() >= MIN_LEVEL) && (player.getNobleLevel() > 0) ? "33383-01.htm" : "33383-07.htm";
break;
}
case State.STARTED:

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java vendored
View File

@@ -97,6 +97,12 @@ public final class Q10827_StepUpToLead extends Quest
}
giveItems(player, GUSTAV_CERTIFICATE, 1);
giveItems(player, SPELLBOOK_FAVOR_OF_THE_EXALTED, 1);
// Give Exalted status here?
// https://l2wiki.com/Noblesse
player.setNoble(2);
player.broadcastUserInfo();
qs.exitQuest(false, true);
}
else