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

Sync with L2JServer Jan 26th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-27 01:59:37 +00:00
parent 5d7ab65416
commit bfe682bbe3
63 changed files with 1049 additions and 1306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java vendored
View File

@@ -197,7 +197,7 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
event.getMentor().sendPacket(new ExMentorList(event.getMentor()));
// Add the mentee skill
event.getMentee().addSkill(MENTEE_MENTOR_SUMMON.getSkill(), false);
event.getMentee().addSkill(MENTEE_MENTOR_SUMMON.getSkill(), true);
// Send mail with the headphone
sendMail(event.getMentee(), MENTEE_ADDED_TITLE, MENTEE_ADDED_BODY, MENTEE_HEADPHONE, 1);
@@ -400,6 +400,8 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
if (mentor != null)
{
MentorManager.getInstance().setPenalty(mentor.getObjectId(), Config.MENTOR_PENALTY_FOR_MENTEE_COMPLETE);
MentorManager.getInstance().deleteMentor(mentor.getObjectId(), player.getObjectId());
if (mentor.isOnline())
{
mentor.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_AWAKENED_AND_THE_MENTOR_MENTEE_RELATIONSHIP_HAS_ENDED_THE_MENTOR_CANNOT_OBTAIN_ANOTHER_MENTEE_FOR_ONE_DAY_AFTER_THE_MENTEE_S_GRADUATION).addPcName(player));
@@ -411,8 +413,6 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
mentor.sendPacket(new ExMentorList(mentor.getPlayerInstance()));
}
MentorManager.getInstance().deleteMentor(mentor.getObjectId(), player.getObjectId());
// Remove the mentee skills
player.removeSkill(MENTEE_MENTOR_SUMMON.getSkillId());
@@ -445,13 +445,18 @@ public class MentorGuide extends AbstractNpcAI implements IXmlReader
int amount = MENTEE_COINS.get(player.getLevel());
if (amount > 0)
{
sendMail(player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
sendMail(mentor.getObjectId(), player, LEVEL_UP_TITLE, String.format(LEVEL_UP_BODY, player.getName(), player.getLevel()), MENTEE_MARK, amount);
}
}
private void sendMail(L2PcInstance player, String title, String body, int itemId, long amount)
{
final Message msg = new Message(MENTOR_GUIDE, player.getObjectId(), title, body, MailType.MENTOR_NPC);
sendMail(player.getObjectId(), player, title, body, itemId, amount);
}
private void sendMail(int objectId, L2PcInstance player, String title, String body, int itemId, long amount)
{
final Message msg = new Message(MENTOR_GUIDE, objectId, title, body, MailType.MENTOR_NPC);
msg.createAttachments().addItem(getName(), itemId, amount, null, player);
MailManager.getInstance().sendMessage(msg);

11
trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java vendored
View File

@@ -69,9 +69,9 @@ public final class GrandBossTeleporters extends AbstractNpcAI
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = "";
QuestState st = getQuestState(player, false);
final QuestState st = getQuestState(player, false);
if (st.hasQuestItems(VACUALITE_FLOATING_STONE))
if (hasQuestItems(player, VACUALITE_FLOATING_STONE))
{
player.teleToLocation(ENTER_HALL_OF_FLAMES);
st.set("allowEnter", "1");
@@ -87,12 +87,7 @@ public final class GrandBossTeleporters extends AbstractNpcAI
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = "";
QuestState st = getQuestState(player, true);
if (st == null)
{
return null;
}
final QuestState st = getQuestState(player, true);
switch (npc.getId())
{