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

Improved previous commit.

Browse Source
This commit is contained in:
MobiusDev
2017-10-15 01:44:20 +00:00
parent f67b7dbd1a
commit 26d0bbc427
12 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
} }
else else
{ {
player.setNoble(1); player.setNobleLevel(1);
player.broadcastUserInfo(); player.broadcastUserInfo();
// TODO: SetOneTimeQuestFlag(talker, 10385, 1); // TODO: SetOneTimeQuestFlag(talker, 10385, 1);
htmltext = "test_server_helper025.html"; htmltext = "test_server_helper025.html";

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) if (Config.FACTION_AUTO_NOBLESS)
{ {
player.setNoble(1); player.setNobleLevel(1);
} }
player.setGood(); player.setGood();
player.getAppearance().setNameColor(Config.FACTION_GOOD_NAME_COLOR); player.getAppearance().setNameColor(Config.FACTION_GOOD_NAME_COLOR);
@@ -103,7 +103,7 @@ public final class FactionSystem extends AbstractNpcAI
} }
if (Config.FACTION_AUTO_NOBLESS) if (Config.FACTION_AUTO_NOBLESS)
{ {
player.setNoble(1); player.setNobleLevel(1);
} }
player.setEvil(); player.setEvil();
player.getAppearance().setNameColor(Config.FACTION_EVIL_NAME_COLOR); player.getAppearance().setNameColor(Config.FACTION_EVIL_NAME_COLOR);

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

@@ -860,14 +860,32 @@ public class AdminEditChar implements IAdminCommandHandler
if (player != null) if (player != null)
{ {
final int nobleLevel = player.getNobleLevel(); switch (player.getNobleLevel())
player.setNoble(nobleLevel == 2 ? 0 : nobleLevel + 1); {
case 0:
{
player.setNobleLevel(1);
player.sendMessage("A GM added you nobless status!");
break;
}
case 1:
{
player.setNobleLevel(2);
player.sendMessage("A GM changed your nobless status to exalted!");
break;
}
case 2:
{
player.setNobleLevel(0);
player.sendMessage("A GM removed your nobless status!");
break;
}
}
if (player.getObjectId() != activeChar.getObjectId()) if (player.getObjectId() != activeChar.getObjectId())
{ {
activeChar.sendMessage("You've changed nobless status of: " + player.getName()); activeChar.sendMessage("You've changed nobless status of: " + player.getName());
} }
player.broadcastUserInfo(); player.broadcastUserInfo();
player.sendMessage("GM changed your nobless status!");
} }
} }
else if (command.startsWith("admin_set_hp")) else if (command.startsWith("admin_set_hp"))

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()); player.doCast(NOBLESSE_PRESENTATION.getSkill());
showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 5000); showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 5000);
player.setNoble(1); player.setNobleLevel(1);
player.broadcastUserInfo(); player.broadcastUserInfo();
giveItems(player, DIMENSIONAL_DIAMOND, 10); giveItems(player, DIMENSIONAL_DIAMOND, 10);
giveItems(player, NOBLESSE_TIARA, 1); giveItems(player, NOBLESSE_TIARA, 1);

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

@@ -100,7 +100,7 @@ public final class Q10827_StepUpToLead extends Quest
// Give Exalted status here? // Give Exalted status here?
// https://l2wiki.com/Noblesse // https://l2wiki.com/Noblesse
player.setNoble(2); player.setNobleLevel(2);
player.broadcastUserInfo(); player.broadcastUserInfo();
qs.exitQuest(false, true); qs.exitQuest(false, true);

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java
View File

@@ -2557,7 +2557,7 @@ public final class L2PcInstance extends L2Playable
// Add noble skills if noble // Add noble skills if noble
if (_nobleLevel > 0) if (_nobleLevel > 0)
{ {
setNoble(_nobleLevel); setNobleLevel(_nobleLevel);
} }
// Add Hero skills if hero // Add Hero skills if hero
@@ -6577,7 +6577,7 @@ public final class L2PcInstance extends L2Playable
player.setPkKills(rset.getInt("pkkills")); player.setPkKills(rset.getInt("pkkills"));
player.setOnlineTime(rset.getLong("onlinetime")); player.setOnlineTime(rset.getLong("onlinetime"));
final int nobleLevel = rset.getInt("nobless"); final int nobleLevel = rset.getInt("nobless");
player.setNoble(nobleLevel); player.setNobleLevel(nobleLevel);
final int factionId = rset.getInt("faction"); final int factionId = rset.getInt("faction");
if (factionId == 1) if (factionId == 1)
@@ -9324,7 +9324,7 @@ public final class L2PcInstance extends L2Playable
return _nobleLevel; return _nobleLevel;
} }
public void setNoble(int level) public void setNobleLevel(int level)
{ {
final Collection<Skill> nobleSkillTree = SkillTreesData.getInstance().getNobleSkillTree().values(); final Collection<Skill> nobleSkillTree = SkillTreesData.getInstance().getNobleSkillTree().values();
if (level != 0) if (level != 0)

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@@ -266,7 +266,7 @@ public final class ClassMaster extends AbstractNpcAI implements IGameXmlReader
} }
else else
{ {
player.setNoble(1); player.setNobleLevel(1);
player.broadcastUserInfo(); player.broadcastUserInfo();
// TODO: SetOneTimeQuestFlag(talker, 10385, 1); // TODO: SetOneTimeQuestFlag(talker, 10385, 1);
htmltext = "test_server_helper025.html"; htmltext = "test_server_helper025.html";

4
L2J_Mobius_3.0_Helios/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) if (Config.FACTION_AUTO_NOBLESS)
{ {
player.setNoble(1); player.setNobleLevel(1);
} }
player.setGood(); player.setGood();
player.getAppearance().setNameColor(Config.FACTION_GOOD_NAME_COLOR); player.getAppearance().setNameColor(Config.FACTION_GOOD_NAME_COLOR);
@@ -103,7 +103,7 @@ public final class FactionSystem extends AbstractNpcAI
} }
if (Config.FACTION_AUTO_NOBLESS) if (Config.FACTION_AUTO_NOBLESS)
{ {
player.setNoble(1); player.setNobleLevel(1);
} }
player.setEvil(); player.setEvil();
player.getAppearance().setNameColor(Config.FACTION_EVIL_NAME_COLOR); player.getAppearance().setNameColor(Config.FACTION_EVIL_NAME_COLOR);

24
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminEditChar.java vendored
View File

@@ -860,14 +860,32 @@ public class AdminEditChar implements IAdminCommandHandler
if (player != null) if (player != null)
{ {
final int nobleLevel = player.getNobleLevel(); switch (player.getNobleLevel())
player.setNoble(nobleLevel == 2 ? 0 : nobleLevel + 1); {
case 0:
{
player.setNobleLevel(1);
player.sendMessage("A GM added you nobless status!");
break;
}
case 1:
{
player.setNobleLevel(2);
player.sendMessage("A GM changed your nobless status to exalted!");
break;
}
case 2:
{
player.setNobleLevel(0);
player.sendMessage("A GM removed your nobless status!");
break;
}
}
if (player.getObjectId() != activeChar.getObjectId()) if (player.getObjectId() != activeChar.getObjectId())
{ {
activeChar.sendMessage("You've changed nobless status of: " + player.getName()); activeChar.sendMessage("You've changed nobless status of: " + player.getName());
} }
player.broadcastUserInfo(); player.broadcastUserInfo();
player.sendMessage("GM changed your nobless status!");
} }
} }
else if (command.startsWith("admin_set_hp")) else if (command.startsWith("admin_set_hp"))

2
L2J_Mobius_3.0_Helios/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()); player.doCast(NOBLESSE_PRESENTATION.getSkill());
showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 5000); showOnScreenMsg(player, NpcStringId.CONGRATULATIONS_YOU_ARE_NOW_A_NOBLESSE, ExShowScreenMessage.TOP_CENTER, 5000);
player.setNoble(1); player.setNobleLevel(1);
player.broadcastUserInfo(); player.broadcastUserInfo();
giveItems(player, DIMENSIONAL_DIAMOND, 10); giveItems(player, DIMENSIONAL_DIAMOND, 10);
giveItems(player, NOBLESSE_TIARA, 1); giveItems(player, NOBLESSE_TIARA, 1);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10827_StepUpToLead/Q10827_StepUpToLead.java vendored
View File

@@ -100,7 +100,7 @@ public final class Q10827_StepUpToLead extends Quest
// Give Exalted status here? // Give Exalted status here?
// https://l2wiki.com/Noblesse // https://l2wiki.com/Noblesse
player.setNoble(2); player.setNobleLevel(2);
player.broadcastUserInfo(); player.broadcastUserInfo();
qs.exitQuest(false, true); qs.exitQuest(false, true);

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

@@ -2559,7 +2559,7 @@ public final class L2PcInstance extends L2Playable
// Add noble skills if noble // Add noble skills if noble
if (_nobleLevel > 0) if (_nobleLevel > 0)
{ {
setNoble(_nobleLevel); setNobleLevel(_nobleLevel);
} }
// Add Hero skills if hero // Add Hero skills if hero
@@ -6579,7 +6579,7 @@ public final class L2PcInstance extends L2Playable
player.setPkKills(rset.getInt("pkkills")); player.setPkKills(rset.getInt("pkkills"));
player.setOnlineTime(rset.getLong("onlinetime")); player.setOnlineTime(rset.getLong("onlinetime"));
final int nobleLevel = rset.getInt("nobless"); final int nobleLevel = rset.getInt("nobless");
player.setNoble(nobleLevel); player.setNobleLevel(nobleLevel);
final int factionId = rset.getInt("faction"); final int factionId = rset.getInt("faction");
if (factionId == 1) if (factionId == 1)
@@ -9334,7 +9334,7 @@ public final class L2PcInstance extends L2Playable
return _nobleLevel; return _nobleLevel;
} }
public void setNoble(int level) public void setNobleLevel(int level)
{ {
final Collection<Skill> nobleSkillTree = SkillTreesData.getInstance().getNobleSkillTree().values(); final Collection<Skill> nobleSkillTree = SkillTreesData.getInstance().getNobleSkillTree().values();
if (level != 0) if (level != 0)