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

Kekropus Letter quest improvements.

Browse Source
This commit is contained in:
MobiusDev 2015-12-04 08:55:27 +00:00
parent 3f420ec6de
commit fd97813500
10 changed files with 37 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/dist/game/data/scripts/quests/Q10390_KekropusLetter/Q10390_KekropusLetter.java vendored
View File

@ -70,7 +70,7 @@ public class Q10390_KekropusLetter extends Quest implements IBypassHandler
// Rewards // Rewards
private static final int EXP_REWARD = 370440; private static final int EXP_REWARD = 370440;
private static final int SP_REWARD = 88; private static final int SP_REWARD = 88;
// Teleport from announce stuff // Teleports
// Town masters locations to teleport should be same order as the Race enum // Town masters locations to teleport should be same order as the Race enum
private static final Location[] TP_LOCS = private static final Location[] TP_LOCS =
{ {
@ -297,20 +297,16 @@ public class Q10390_KekropusLetter extends Quest implements IBypassHandler
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA))
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
{ {
final NpcHtmlMessage html = new NpcHtmlMessage(0, 0); final NpcHtmlMessage html = new NpcHtmlMessage(0, 0);
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10390_KekropusLetter/" + "Announce_" + player.getRace().name() + ".html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10390_KekropusLetter/Announce_" + player.getRace().name() + ".html"));
player.sendPacket(html); player.sendPacket(html);
// todo: get proper announce html && handle it // todo: get proper announce html && handle it
} }
return;
} }
} }
@ -318,7 +314,7 @@ public class Q10390_KekropusLetter extends Quest implements IBypassHandler
public boolean useBypass(String command, L2PcInstance player, L2Character bypassOrigin) public boolean useBypass(String command, L2PcInstance player, L2Character bypassOrigin)
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if ((qs != null) || (player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL) || (player.getRace() == Race.ERTHEIA) || !command.equals("Q10390_Teleport")) if ((qs != null) || (player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL) || (player.getRace() == Race.ERTHEIA))
{ {
return false; return false;
} }

12
trunk/dist/game/data/scripts/quests/Q10393_KekropusLetter_AClueCompleted/Q10393_KekropusLetter_AClueCompleted.java vendored
View File

@ -44,17 +44,17 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
*/ */
public class Q10393_KekropusLetter_AClueCompleted extends Quest implements IBypassHandler public class Q10393_KekropusLetter_AClueCompleted extends Quest implements IBypassHandler
{ {
// Npcs // NPCs
private static final int FLUTTER = 30677; private static final int FLUTTER = 30677;
private static final int KELIOS = 33862; private static final int KELIOS = 33862;
// Items // Items
private static final ItemHolder SCROLL_OF_ESCAPE_OUTLAW_FOREST = new ItemHolder(37026, 1); private static final ItemHolder SCROLL_OF_ESCAPE_OUTLAW_FOREST = new ItemHolder(37026, 1);
private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 15); private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 15);
private static final ItemHolder ENCHANT_ARMOR_C = new ItemHolder(952, 4); private static final ItemHolder ENCHANT_ARMOR_C = new ItemHolder(952, 4);
// Level Condition // Requirements
private static final int MIN_LEVEL = 46; private static final int MIN_LEVEL = 46;
private static final int MAX_LEVEL = 51; private static final int MAX_LEVEL = 51;
// Other // Teleport
private static final Location TELE_LOCATION = new Location(83697, 55446, -1512); private static final Location TELE_LOCATION = new Location(83697, 55446, -1512);
private static final String[] COMMAND = private static final String[] COMMAND =
{ {
@ -151,10 +151,7 @@ public class Q10393_KekropusLetter_AClueCompleted extends Quest implements IBypa
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA))
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
@ -163,7 +160,6 @@ public class Q10393_KekropusLetter_AClueCompleted extends Quest implements IBypa
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10393_KekropusLetter_AClueCompleted/Announce.html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10393_KekropusLetter_AClueCompleted/Announce.html"));
player.sendPacket(html); player.sendPacket(html);
} }
return;
} }
} }

12
trunk/dist/game/data/scripts/quests/Q10397_KekropusLetter_ASuspiciousBadge/Q10397_KekropusLetter_ASuspiciousBadge.java vendored
View File

@ -44,17 +44,17 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
*/ */
public class Q10397_KekropusLetter_ASuspiciousBadge extends Quest implements IBypassHandler public class Q10397_KekropusLetter_ASuspiciousBadge extends Quest implements IBypassHandler
{ {
// Npcs // NPCs
private static final int MOUEN = 30196; private static final int MOUEN = 30196;
private static final int ANDY = 33845; private static final int ANDY = 33845;
// Items // Items
private static final ItemHolder SCROLL_OF_ESCAPE_SEA_OF_SPORES = new ItemHolder(37027, 1); private static final ItemHolder SCROLL_OF_ESCAPE_SEA_OF_SPORES = new ItemHolder(37027, 1);
private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 20); private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 20);
private static final ItemHolder ENCHANT_WEAPON_B = new ItemHolder(947, 2); private static final ItemHolder ENCHANT_WEAPON_B = new ItemHolder(947, 2);
// Level Condition // Requirements
private static final int MIN_LEVEL = 52; private static final int MIN_LEVEL = 52;
private static final int MAX_LEVEL = 57; private static final int MAX_LEVEL = 57;
// Others // Teleport
private static final Location TELE_LOCATION = new Location(80951, 56382, -1552); private static final Location TELE_LOCATION = new Location(80951, 56382, -1552);
private static final String[] COMMAND = private static final String[] COMMAND =
{ {
@ -156,10 +156,7 @@ public class Q10397_KekropusLetter_ASuspiciousBadge extends Quest implements IBy
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA))
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
@ -168,7 +165,6 @@ public class Q10397_KekropusLetter_ASuspiciousBadge extends Quest implements IBy
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10397_KekropusLetter_ASuspiciousBadge/Announce.html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10397_KekropusLetter_ASuspiciousBadge/Announce.html"));
player.sendPacket(html); player.sendPacket(html);
} }
return;
} }
} }

12
trunk/dist/game/data/scripts/quests/Q10401_KekropusLetter_DecodingTheBadge/Q10401_KekropusLetter_DecodingTheBadge.java vendored
View File

@ -44,17 +44,17 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
*/ */
public class Q10401_KekropusLetter_DecodingTheBadge extends Quest implements IBypassHandler public class Q10401_KekropusLetter_DecodingTheBadge extends Quest implements IBypassHandler
{ {
// Npcs // NPCs
private static final int PATERSON = 33864; private static final int PATERSON = 33864;
private static final int EBLUNE = 33865; private static final int EBLUNE = 33865;
// Items // Items
private static final ItemHolder SCROLL_OF_ESCAPE_FORSAKEN_PLAINS = new ItemHolder(37028, 1); private static final ItemHolder SCROLL_OF_ESCAPE_FORSAKEN_PLAINS = new ItemHolder(37028, 1);
private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 30); private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 30);
private static final ItemHolder ENCHANT_ARMOR_B = new ItemHolder(948, 5); private static final ItemHolder ENCHANT_ARMOR_B = new ItemHolder(948, 5);
// Level Condition // Requirements
private static final int MIN_LEVEL = 58; private static final int MIN_LEVEL = 58;
private static final int MAX_LEVEL = 60; private static final int MAX_LEVEL = 60;
// Others // Teleport
private static final Location TELE_LOCATION = new Location(147619, 24681, -1984); private static final Location TELE_LOCATION = new Location(147619, 24681, -1984);
private static final String[] COMMAND = private static final String[] COMMAND =
{ {
@ -156,10 +156,7 @@ public class Q10401_KekropusLetter_DecodingTheBadge extends Quest implements IBy
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA))
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
@ -168,7 +165,6 @@ public class Q10401_KekropusLetter_DecodingTheBadge extends Quest implements IBy
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10401_KekropusLetter_DecodingTheBadge/Announce.html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10401_KekropusLetter_DecodingTheBadge/Announce.html"));
player.sendPacket(html); player.sendPacket(html);
} }
return;
} }
} }

13
trunk/dist/game/data/scripts/quests/Q10404_KekropusLetter_AHiddenMeaning/Q10404_KekropusLetter_AHiddenMeaning.java vendored
View File

@ -44,17 +44,17 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
*/ */
public class Q10404_KekropusLetter_AHiddenMeaning extends Quest implements IBypassHandler public class Q10404_KekropusLetter_AHiddenMeaning extends Quest implements IBypassHandler
{ {
// Npcs // NPCs
private static final int PATERSON = 33864; private static final int PATERSON = 33864;
private static final int SHUVANN = 33867; private static final int SHUVANN = 33867;
// Items // Items
private static final ItemHolder SCROLL_OF_ESCAPE_FIELDS_OF_MASSACRE = new ItemHolder(37029, 1); private static final ItemHolder SCROLL_OF_ESCAPE_FIELDS_OF_MASSACRE = new ItemHolder(37029, 1);
private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 71); private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 71);
private static final ItemHolder ENCHANT_WEAPON_A = new ItemHolder(729, 1); private static final ItemHolder ENCHANT_WEAPON_A = new ItemHolder(729, 1);
// Level Condition // Requirements
private static final int MIN_LEVEL = 61; private static final int MIN_LEVEL = 61;
private static final int MAX_LEVEL = 64; private static final int MAX_LEVEL = 64;
// Others // Teleport
private static final Location TELE_LOCATION = new Location(147619, 24681, -1984); private static final Location TELE_LOCATION = new Location(147619, 24681, -1984);
private static final String[] COMMAND = private static final String[] COMMAND =
{ {
@ -156,10 +156,7 @@ public class Q10404_KekropusLetter_AHiddenMeaning extends Quest implements IBypa
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA))
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
@ -168,8 +165,6 @@ public class Q10404_KekropusLetter_AHiddenMeaning extends Quest implements IBypa
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10404_KekropusLetter_AHiddenMeaning/Announce.html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10404_KekropusLetter_AHiddenMeaning/Announce.html"));
player.sendPacket(html); player.sendPacket(html);
} }
return;
} }
} }

13
trunk/dist/game/data/scripts/quests/Q10408_KekropusLetter_TheSwampOfScream/Q10408_KekropusLetter_TheSwampOfScream.java vendored
View File

@ -44,17 +44,17 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
*/ */
public class Q10408_KekropusLetter_TheSwampOfScream extends Quest implements IBypassHandler public class Q10408_KekropusLetter_TheSwampOfScream extends Quest implements IBypassHandler
{ {
// Npcs // NPCs
private static final int MATHIAS = 31340; private static final int MATHIAS = 31340;
private static final int DOKARA = 33847; private static final int DOKARA = 33847;
// Items // Items
private static final ItemHolder SCROLL_OF_ESCAPE_SEA_OF_SPORES = new ItemHolder(37027, 1); private static final ItemHolder SCROLL_OF_ESCAPE_SEA_OF_SPORES = new ItemHolder(37027, 1);
private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 91); private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 91);
private static final ItemHolder ENCHANT_WEAPON_A = new ItemHolder(729, 2); private static final ItemHolder ENCHANT_WEAPON_A = new ItemHolder(729, 2);
// Level Condition // Requirements
private static final int MIN_LEVEL = 65; private static final int MIN_LEVEL = 65;
private static final int MAX_LEVEL = 69; private static final int MAX_LEVEL = 69;
// Others // Teleport
private static final Location TELE_LOCATION = new Location(42713, -48068, -801); private static final Location TELE_LOCATION = new Location(42713, -48068, -801);
private static final String[] COMMAND = private static final String[] COMMAND =
{ {
@ -160,10 +160,7 @@ public class Q10408_KekropusLetter_TheSwampOfScream extends Quest implements IBy
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA) && !player.isMageClass())
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
@ -172,8 +169,6 @@ public class Q10408_KekropusLetter_TheSwampOfScream extends Quest implements IBy
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10408_KekropusLetter_TheSwampOfScream/Announce.html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10408_KekropusLetter_TheSwampOfScream/Announce.html"));
player.sendPacket(html); player.sendPacket(html);
} }
return;
} }
} }

13
trunk/dist/game/data/scripts/quests/Q10411_KekropusLetter_TheForestOfTheDead/Q10411_KekropusLetter_TheForestOfTheDead.java vendored
View File

@ -44,17 +44,17 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
*/ */
public class Q10411_KekropusLetter_TheForestOfTheDead extends Quest implements IBypassHandler public class Q10411_KekropusLetter_TheForestOfTheDead extends Quest implements IBypassHandler
{ {
// Npcs // NPCs
private static final int MATHIAS = 31340; private static final int MATHIAS = 31340;
private static final int HUTABA = 33849; private static final int HUTABA = 33849;
// Items // Items
private static final ItemHolder SCROLL_OF_ESCAPE_THE_FOREST_OF_THE_DEAD = new ItemHolder(37031, 1); private static final ItemHolder SCROLL_OF_ESCAPE_THE_FOREST_OF_THE_DEAD = new ItemHolder(37031, 1);
private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 91); private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 91);
private static final ItemHolder ENCHANT_WEAPON_A = new ItemHolder(729, 2); private static final ItemHolder ENCHANT_WEAPON_A = new ItemHolder(729, 2);
// Level Condition // Requirements
private static final int MIN_LEVEL = 65; private static final int MIN_LEVEL = 65;
private static final int MAX_LEVEL = 69; private static final int MAX_LEVEL = 69;
// Others // Teleport
private static final Location TELE_LOCATION = new Location(42713, -48068, -801); private static final Location TELE_LOCATION = new Location(42713, -48068, -801);
private static final String[] COMMAND = private static final String[] COMMAND =
{ {
@ -164,10 +164,7 @@ public class Q10411_KekropusLetter_TheForestOfTheDead extends Quest implements I
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA) && player.isMageClass())
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
@ -176,8 +173,6 @@ public class Q10411_KekropusLetter_TheForestOfTheDead extends Quest implements I
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10411_KekropusLetter_TheForestOfTheDead/Announce.html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10411_KekropusLetter_TheForestOfTheDead/Announce.html"));
player.sendPacket(html); player.sendPacket(html);
} }
return;
} }
} }

13
trunk/dist/game/data/scripts/quests/Q10414_KekropusLetter_WithCourage/Q10414_KekropusLetter_WithCourage.java vendored
View File

@ -44,17 +44,17 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
*/ */
public class Q10414_KekropusLetter_WithCourage extends Quest implements IBypassHandler public class Q10414_KekropusLetter_WithCourage extends Quest implements IBypassHandler
{ {
// Npcs // NPCs
private static final int ANDREI = 31292; private static final int ANDREI = 31292;
private static final int JANITT = 33851; private static final int JANITT = 33851;
// Items // Items
private static final ItemHolder SCROLL_OF_ESCAPE_WALL_OF_ARGOS = new ItemHolder(37032, 1); private static final ItemHolder SCROLL_OF_ESCAPE_WALL_OF_ARGOS = new ItemHolder(37032, 1);
private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 123); private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 123);
private static final ItemHolder ENCHANT_ARMOR_A = new ItemHolder(730, 5); private static final ItemHolder ENCHANT_ARMOR_A = new ItemHolder(730, 5);
// Level Condition // Requirements
private static final int MIN_LEVEL = 70; private static final int MIN_LEVEL = 70;
private static final int MAX_LEVEL = 75; private static final int MAX_LEVEL = 75;
// Others // Teleport
private static final Location TELE_LOCATION = new Location(147404, -56707, -2784); private static final Location TELE_LOCATION = new Location(147404, -56707, -2784);
private static final String[] COMMAND = private static final String[] COMMAND =
{ {
@ -160,10 +160,7 @@ public class Q10414_KekropusLetter_WithCourage extends Quest implements IBypassH
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA) && !player.isMageClass())
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
@ -172,8 +169,6 @@ public class Q10414_KekropusLetter_WithCourage extends Quest implements IBypassH
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10414_KekropusLetter_WithCourage/Announce.html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10414_KekropusLetter_WithCourage/Announce.html"));
player.sendPacket(html); player.sendPacket(html);
} }
return;
} }
} }

13
trunk/dist/game/data/scripts/quests/Q10415_KekropusLetter_WithWisdom/Q10415_KekropusLetter_WithWisdom.java vendored
View File

@ -44,17 +44,17 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
*/ */
public class Q10415_KekropusLetter_WithWisdom extends Quest implements IBypassHandler public class Q10415_KekropusLetter_WithWisdom extends Quest implements IBypassHandler
{ {
// Npcs // NPCs
private static final int ANDREI = 31292; private static final int ANDREI = 31292;
private static final int JANITT = 33851; private static final int JANITT = 33851;
// Items // Items
private static final ItemHolder SCROLL_OF_ESCAPE_WALL_OF_ARGOS = new ItemHolder(37032, 1); private static final ItemHolder SCROLL_OF_ESCAPE_WALL_OF_ARGOS = new ItemHolder(37032, 1);
private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 123); private static final ItemHolder STEEL_DOOR_GUILD = new ItemHolder(37045, 123);
private static final ItemHolder ENCHANT_ARMOR_A = new ItemHolder(730, 5); private static final ItemHolder ENCHANT_ARMOR_A = new ItemHolder(730, 5);
// Level Condition // Requirements
private static final int MIN_LEVEL = 70; private static final int MIN_LEVEL = 70;
private static final int MAX_LEVEL = 75; private static final int MAX_LEVEL = 75;
// Others // Teleport
private static final Location TELE_LOCATION = new Location(147404, -56707, -2784); private static final Location TELE_LOCATION = new Location(147404, -56707, -2784);
private static final String[] COMMAND = private static final String[] COMMAND =
{ {
@ -161,10 +161,7 @@ public class Q10415_KekropusLetter_WithWisdom extends Quest implements IBypassHa
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final int oldLevel = event.getOldLevel(); if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL) && (player.getRace() != Race.ERTHEIA))
final int newLevel = event.getNewLevel();
if (((oldLevel == (newLevel - 1)) && (player.getLevel() >= MIN_LEVEL)) && (player.getLevel() <= MAX_LEVEL) && !(player.getRace() == Race.ERTHEIA) && !player.isMageClass())
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if (qs == null) if (qs == null)
@ -173,8 +170,6 @@ public class Q10415_KekropusLetter_WithWisdom extends Quest implements IBypassHa
html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10415_KekropusLetter_WithWisdom/Announce.html")); html.setHtml(HtmCache.getInstance().getHtm(player.getHtmlPrefix(), "scripts/quests/Q10415_KekropusLetter_WithWisdom/Announce.html"));
player.sendPacket(html); player.sendPacket(html);
} }
return;
} }
} }

2
trunk/dist/game/data/scripts/quests/Q10755_LettersFromTheQueen_WindyHill/Q10755_LettersFromTheQueen_WindyHill.java vendored
View File

@ -218,7 +218,7 @@ public class Q10755_LettersFromTheQueen_WindyHill extends Quest implements IBypa
public boolean useBypass(String command, L2PcInstance player, L2Character bypassOrigin) public boolean useBypass(String command, L2PcInstance player, L2Character bypassOrigin)
{ {
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
if ((qs != null) || (player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL) || (player.getRace() != Race.ERTHEIA) || !command.equals("Q10755_Teleport")) if ((qs != null) || (player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL) || (player.getRace() != Race.ERTHEIA))
{ {
return false; return false;
} }