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

Added latest commits for todays sync.

Browse Source
This commit is contained in:
mobius
2015-01-24 22:41:54 +00:00
parent ebe4ba005d
commit 093b3d3841
94 changed files with 1618 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/dist/game/data/scripts/handlers/MasterHandler.java vendored
View File

@ -130,8 +130,6 @@ import handlers.bypasshandlers.ReceivePremium;
import handlers.bypasshandlers.ReleaseAttribute;
import handlers.bypasshandlers.RentPet;
import handlers.bypasshandlers.SkillList;
import handlers.bypasshandlers.SupportBlessing;
import handlers.bypasshandlers.SupportMagic;
import handlers.bypasshandlers.TerritoryStatus;
import handlers.bypasshandlers.TutorialClose;
import handlers.bypasshandlers.VoiceCommand;
@ -426,8 +424,6 @@ public class MasterHandler
ReleaseAttribute.class,
RentPet.class,
SkillList.class,
SupportBlessing.class,
SupportMagic.class,
TerritoryStatus.class,
TutorialClose.class,
VoiceCommand.class,

138
trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@ -18,19 +18,15 @@
*/
package handlers.bypasshandlers;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Collection;
import java.util.Set;
import java.util.logging.Level;
import java.util.stream.Collectors;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jserver.gameserver.model.events.EventType;
import com.l2jserver.gameserver.model.events.listeners.AbstractEventListener;
import com.l2jserver.gameserver.model.quest.Quest;
@ -85,24 +81,28 @@ public class QuestLink implements IBypassHandler
* @param npc The table containing quests of the L2NpcInstance
* @param quests
*/
public static void showQuestChooseWindow(L2PcInstance player, L2Npc npc, Quest[] quests)
public static void showQuestChooseWindow(L2PcInstance player, L2Npc npc, Collection<Quest> quests)
{
final StringBuilder sb = StringUtil.startAppend(150, "<html><body>");
String state = "";
String color = "";
int questId = -1;
//@formatter:off
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
.map(AbstractEventListener::getOwner)
.filter(Quest.class::isInstance)
.map(Quest.class::cast)
.distinct()
.collect(Collectors.toSet());
//@formatter:on
for (Quest quest : quests)
{
if (quest == null)
{
continue;
}
final QuestState qs = player.getQuestState(quest.getScriptName());
if ((qs == null) || qs.isCreated())
{
state = quest.isCustomQuest() ? "" : "01";
if (quest.canStartQuest(player))
if (startingQuests.contains(quest) && quest.canStartQuest(player))
{
color = "bbaa88";
}
@ -130,16 +130,7 @@ public class QuestLink implements IBypassHandler
}
else
{
questId = quest.getId();
if (quest.getId() > 10000)
{
questId -= 5000;
}
else if (questId == 146)
{
questId = 640;
}
StringUtil.append(sb, "<fstring>", String.valueOf(questId), state, "</fstring>");
StringUtil.append(sb, "<fstring>", String.valueOf(quest.getId()), state, "</fstring>");
}
sb.append("</button></font><br>");
}
@ -210,101 +201,30 @@ public class QuestLink implements IBypassHandler
player.sendPacket(ActionFailed.STATIC_PACKET);
}
/**
* @param player
* @param npcId The Identifier of the NPC
* @return a table containing all QuestState from the table _quests in which the L2PcInstance must talk to the NPC.
*/
private static List<QuestState> getQuestsForTalk(final L2PcInstance player, int npcId)
{
// Create a QuestState table that will contain all QuestState to modify
final List<QuestState> states = new ArrayList<>();
final L2NpcTemplate template = NpcData.getInstance().getTemplate(npcId);
if (template == null)
{
_log.log(Level.WARNING, QuestLink.class.getSimpleName() + ": " + player.getName() + " requested quests for talk on non existing npc " + npcId);
return states;
}
// Go through the QuestState of the L2PcInstance quests
for (AbstractEventListener listener : template.getListeners(EventType.ON_NPC_TALK))
{
if (listener.getOwner() instanceof Quest)
{
final Quest quest = (Quest) listener.getOwner();
// Copy the current L2PcInstance QuestState in the QuestState table
final QuestState st = player.getQuestState(quest.getName());
if (st != null)
{
states.add(st);
}
}
}
// Return a table containing all QuestState to modify
return states;
}
/**
* Collect awaiting quests/start points and display a QuestChooseWindow (if several available) or QuestWindow.
* @param player the L2PcInstance that talk with the {@code npc}.
* @param npc the L2NpcInstance that chats with the {@code player}.
*/
public static void showQuestWindow(L2PcInstance player, L2Npc npc)
private static void showQuestWindow(final L2PcInstance player, L2Npc npc)
{
boolean conditionMeet = false;
// collect awaiting quests and start points
final Set<Quest> options = new HashSet<>();
//@formatter:off
final Set<Quest> quests = npc.getListeners(EventType.ON_NPC_TALK).stream()
.map(AbstractEventListener::getOwner)
.filter(Quest.class::isInstance)
.map(Quest.class::cast)
.filter(quest -> (quest.getId() > 0) && (quest.getId() < 20000))
.distinct()
.collect(Collectors.toSet());
//@formatter:on
// Quests are limited between 1 and 999 because those are the quests that are supported by the client.
// By limiting them there, we are allowed to create custom quests at higher IDs without interfering
for (QuestState state : getQuestsForTalk(player, npc.getId()))
if (quests.size() > 1)
{
final Quest quest = state.getQuest();
if (quest == null)
{
_log.log(Level.WARNING, player + " Requested incorrect quest state for non existing quest: " + state.getQuestName());
continue;
}
if ((quest.getId() > 0) && (quest.getId() < 20000))
{
options.add(quest);
if (quest.canStartQuest(player))
{
conditionMeet = true;
}
}
showQuestChooseWindow(player, npc, quests);
}
for (AbstractEventListener listener : npc.getListeners(EventType.ON_NPC_QUEST_START))
else if (quests.size() == 1)
{
if (listener.getOwner() instanceof Quest)
{
final Quest quest = (Quest) listener.getOwner();
if ((quest.getId() > 0) && (quest.getId() < 20000))
{
options.add(quest);
if (quest.canStartQuest(player))
{
conditionMeet = true;
}
}
}
}
if (!conditionMeet)
{
showQuestWindow(player, npc, "");
}
else if (options.size() > 1)
{
showQuestChooseWindow(player, npc, options.toArray(new Quest[options.size()]));
}
else if (options.size() == 1)
{
showQuestWindow(player, npc, options.stream().findFirst().get().getName());
showQuestWindow(player, npc, quests.stream().findFirst().get().getName());
}
else
{

60
trunk/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java vendored
View File

@ -1,60 +0,0 @@
/*
* Copyright (C) 2004-2015 L2J DataPack
*
* This file is part of L2J DataPack.
*
* L2J DataPack is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* L2J DataPack is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.bypasshandlers;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.skills.CommonSkill;
public class SupportBlessing implements IBypassHandler
{
private static final String[] COMMANDS =
{
"GiveBlessing"
};
@Override
public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
{
if (!target.isNpc())
{
return false;
}
final L2Npc npc = (L2Npc) target;
// If the player is too high level, display a message and return
if ((activeChar.getLevel() > 39) || (activeChar.getClassId().level() >= 2))
{
npc.showChatWindow(activeChar, "data/html/default/SupportBlessingHighLevel.htm");
return true;
}
npc.setTarget(activeChar);
npc.doCast(CommonSkill.BLESSING_OF_PROTECTION.getSkill());
return false;
}
@Override
public String[] getBypassList()
{
return COMMANDS;
}
}

182
trunk/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java vendored
View File

@ -1,182 +0,0 @@
/*
* Copyright (C) 2004-2015 L2J DataPack
*
* This file is part of L2J DataPack.
*
* L2J DataPack is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* L2J DataPack is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.bypasshandlers;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
public class SupportMagic implements IBypassHandler
{
private static final String[] COMMANDS =
{
"supportmagicservitor",
"supportmagic"
};
// Buffs
private static final SkillHolder HASTE_1 = new SkillHolder(4327, 1);
private static final SkillHolder HASTE_2 = new SkillHolder(5632, 1);
private static final SkillHolder CUBIC = new SkillHolder(4338, 1);
private static final SkillHolder[] FIGHTER_BUFFS =
{
new SkillHolder(4322, 1), // Wind Walk
new SkillHolder(4323, 1), // Shield
new SkillHolder(5637, 1), // Magic Barrier
new SkillHolder(4324, 1), // Bless the Body
new SkillHolder(4325, 1), // Vampiric Rage
new SkillHolder(4326, 1), // Regeneration
};
private static final SkillHolder[] MAGE_BUFFS =
{
new SkillHolder(4322, 1), // Wind Walk
new SkillHolder(4323, 1), // Shield
new SkillHolder(5637, 1), // Magic Barrier
new SkillHolder(4328, 1), // Bless the Soul
new SkillHolder(4329, 1), // Acumen
new SkillHolder(4330, 1), // Concentration
new SkillHolder(4331, 1), // Empower
};
private static final SkillHolder[] SUMMON_BUFFS =
{
new SkillHolder(4322, 1), // Wind Walk
new SkillHolder(4323, 1), // Shield
new SkillHolder(5637, 1), // Magic Barrier
new SkillHolder(4324, 1), // Bless the Body
new SkillHolder(4325, 1), // Vampiric Rage
new SkillHolder(4326, 1), // Regeneration
new SkillHolder(4328, 1), // Bless the Soul
new SkillHolder(4329, 1), // Acumen
new SkillHolder(4330, 1), // Concentration
new SkillHolder(4331, 1), // Empower
};
// Levels
private static final int LOWEST_LEVEL = 6;
private static final int HIGHEST_LEVEL = 75;
private static final int CUBIC_LOWEST = 16;
private static final int CUBIC_HIGHEST = 34;
private static final int HASTE_LEVEL_2 = 40;
@Override
public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
{
if (!target.isNpc() || activeChar.isCursedWeaponEquipped())
{
return false;
}
if (command.equalsIgnoreCase(COMMANDS[0]))
{
makeSupportMagic(activeChar, (L2Npc) target, true);
}
else if (command.equalsIgnoreCase(COMMANDS[1]))
{
makeSupportMagic(activeChar, (L2Npc) target, false);
}
return true;
}
private static void makeSupportMagic(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final int level = player.getLevel();
if (isSummon && !player.hasServitors())
{
npc.showChatWindow(player, "data/html/default/SupportMagicNoSummon.htm");
return;
}
else if (level > HIGHEST_LEVEL)
{
npc.showChatWindow(player, "data/html/default/SupportMagicHighLevel.htm");
return;
}
else if (level < LOWEST_LEVEL)
{
npc.showChatWindow(player, "data/html/default/SupportMagicLowLevel.htm");
return;
}
else if (player.getClassId().level() == 3)
{
player.sendMessage("Only adventurers who have not completed their 3rd class transfer may receive these buffs."); // Custom message
return;
}
if (isSummon)
{
player.getServitors().values().forEach(s ->
{
npc.setTarget(s);
for (SkillHolder skill : SUMMON_BUFFS)
{
npc.doCast(skill.getSkill());
}
if (level >= HASTE_LEVEL_2)
{
npc.doCast(HASTE_2.getSkill());
}
else
{
npc.doCast(HASTE_1.getSkill());
}
});
}
else
{
npc.setTarget(player);
if (player.isInCategory(CategoryType.BEGINNER_MAGE))
{
for (SkillHolder skill : MAGE_BUFFS)
{
npc.doCast(skill.getSkill());
}
}
else
{
for (SkillHolder skill : FIGHTER_BUFFS)
{
npc.doCast(skill.getSkill());
}
if (level >= HASTE_LEVEL_2)
{
npc.doCast(HASTE_2.getSkill());
}
else
{
npc.doCast(HASTE_1.getSkill());
}
}
if ((level >= CUBIC_LOWEST) && (level <= CUBIC_HIGHEST))
{
player.doSimultaneousCast(CUBIC.getSkill());
}
}
}
@Override
public String[] getBypassList()
{
return COMMANDS;
}
}