Story quest rewards changes to match description for 77 level and beyond.

Contributed by champzix1.
This commit is contained in:
MobiusDev
2019-01-15 22:11:14 +00:00
parent 3c634ed5b6
commit ea3993d360
21 changed files with 51 additions and 111 deletions

View File

@@ -39,7 +39,6 @@ public final class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
// Items // Items
private static final int SOE_TOWN_OF_GODDARD = 37121; // Scroll of Escape: Town of Goddard private static final int SOE_TOWN_OF_GODDARD = 37121; // Scroll of Escape: Town of Goddard
private static final int SOE_VARKA_SILENOS_BARRACKS = 37034; // Scroll of Escape: Varka Silenos Barracks private static final int SOE_VARKA_SILENOS_BARRACKS = 37034; // Scroll of Escape: Varka Silenos Barracks
private static final int EWS = 959; // Scroll: Enchant Weapon (S-grade)
// Location // Location
private static final Location TELEPORT_LOC = new Location(147491, -56633, -2776); private static final Location TELEPORT_LOC = new Location(147491, -56633, -2776);
// Misc // Misc
@@ -92,11 +91,10 @@ public final class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
if (st.isCond(2)) if (st.isCond(2))
{ {
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, EWS, 1);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 1_277_640, 306); addExpAndSp(player, 1277640, 306);
} }
showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_KEKROPUS_AT_LV_81, ExShowScreenMessage.TOP_CENTER, 6000); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_KEKROPUS_AT_LV_81, ExShowScreenMessage.TOP_CENTER, 6000);
htmltext = event; htmltext = event;

View File

@@ -59,8 +59,6 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
21357, // Varka Silenos Priest 21357, // Varka Silenos Priest
27515, // Varka Backup Wizard 27515, // Varka Backup Wizard
}; };
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
@@ -105,11 +103,10 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
if (st.isCond(2)) if (st.isCond(2))
{ {
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 22_997_520, 5519); addExpAndSp(player, 492760460, 5519);
} }
htmltext = event; htmltext = event;
} }
@@ -160,33 +157,33 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
if (npc.getId() == EMBRYO_SHOOTER) if (npc.getId() == EMBRYO_SHOOTER)
{ {
if (shooterCount < 50) if (shooterCount < 100)
{ {
st.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount); st.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
} }
else if (wizardCount < 50) else if (wizardCount < 100)
{ {
st.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount); st.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((shooterCount >= 50) && (wizardCount >= 50)) if ((shooterCount >= 100) && (wizardCount >= 100))
{ {
st.setCond(2, true); st.setCond(2, true);
} }
} }
else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId())) else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
{ {
if (st.getInt("KillCount_" + EMBRYO_WIZARD) < 50) if (st.getInt("KillCount_" + EMBRYO_WIZARD) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH); embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
} }
} }
else if (st.getInt("KillCount_" + EMBRYO_SHOOTER) < 50) else if (st.getInt("KillCount_" + EMBRYO_SHOOTER) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);

View File

@@ -35,8 +35,6 @@ public final class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
// NPCs // NPCs
private static final int HANSEN = 33853; private static final int HANSEN = 33853;
private static final int COMMANDER_MOS = 27502; private static final int COMMANDER_MOS = 27502;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
@@ -88,11 +86,10 @@ public final class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33853-07.html"; htmltext = "33853-07.html";
} }

View File

@@ -36,8 +36,6 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
private static final int HANSEN = 33853; private static final int HANSEN = 33853;
private static final int CHIEF_HORUS = 27503; private static final int CHIEF_HORUS = 27503;
private static final int KAMPF = 27516; private static final int KAMPF = 27516;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -92,11 +90,10 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 351479151, 1839);
} }
htmltext = "33853-07.html"; htmltext = "33853-07.html";
} }

View File

@@ -60,8 +60,6 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
21342, // Ketra Orc Grand Priest 21342, // Ketra Orc Grand Priest
27512, // Varka Backup Wizard 27512, // Varka Backup Wizard
}; };
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -108,11 +106,10 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
if (qs.isCond(2)) if (qs.isCond(2))
{ {
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 22_997_520, 5519); addExpAndSp(player, 492760460, 5519);
} }
htmltext = event; htmltext = event;
} }
@@ -163,33 +160,33 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
if (npc.getId() == EMBRYO_SHOOTER) if (npc.getId() == EMBRYO_SHOOTER)
{ {
if (shooterCount < 50) if (shooterCount < 100)
{ {
qs.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount); qs.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
} }
else if (wizardCount < 50) else if (wizardCount < 100)
{ {
qs.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount); qs.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((shooterCount >= 50) && (wizardCount >= 50)) if ((shooterCount >= 100) && (wizardCount >= 100))
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId())) else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
{ {
if (qs.getInt("KillCount_" + EMBRYO_WIZARD) < 50) if (qs.getInt("KillCount_" + EMBRYO_WIZARD) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH); embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
} }
} }
else if (qs.getInt("KillCount_" + EMBRYO_SHOOTER) < 50) else if (qs.getInt("KillCount_" + EMBRYO_SHOOTER) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);

View File

@@ -35,8 +35,6 @@ public final class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
// NPCs // NPCs
private static final int LUGONNES = 33852; private static final int LUGONNES = 33852;
private static final int COMMANDER_TAYR = 27500; private static final int COMMANDER_TAYR = 27500;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -90,11 +88,10 @@ public final class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33852-07.html"; htmltext = "33852-07.html";
} }

View File

@@ -36,8 +36,6 @@ public final class Q10427_AssassinationOfTheKetraOrcChief extends Quest
private static final int LUGONNES = 33852; private static final int LUGONNES = 33852;
private static final int CHIEF_BRAKKI = 27501; private static final int CHIEF_BRAKKI = 27501;
private static final int KAMPF = 27516; private static final int KAMPF = 27516;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -92,11 +90,10 @@ public final class Q10427_AssassinationOfTheKetraOrcChief extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33852-07.html"; htmltext = "33852-07.html";
} }

View File

@@ -39,7 +39,6 @@ public final class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
// Items // Items
private static final int SOE_TOWN_OF_GODDARD = 37121; // Scroll of Escape: Town of Goddard private static final int SOE_TOWN_OF_GODDARD = 37121; // Scroll of Escape: Town of Goddard
private static final int SOE_VARKA_SILENOS_BARRACKS = 37034; // Scroll of Escape: Varka Silenos Barracks private static final int SOE_VARKA_SILENOS_BARRACKS = 37034; // Scroll of Escape: Varka Silenos Barracks
private static final int EWS = 959; // Scroll: Enchant Weapon (S-grade)
// Location // Location
private static final Location TELEPORT_LOC = new Location(147491, -56633, -2776); private static final Location TELEPORT_LOC = new Location(147491, -56633, -2776);
// Misc // Misc
@@ -92,11 +91,10 @@ public final class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
if (st.isCond(2)) if (st.isCond(2))
{ {
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, EWS, 1);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 1_277_640, 306); addExpAndSp(player, 1277640, 306);
} }
showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_KEKROPUS_AT_LV_81, ExShowScreenMessage.TOP_CENTER, 6000); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_KEKROPUS_AT_LV_81, ExShowScreenMessage.TOP_CENTER, 6000);
htmltext = event; htmltext = event;

View File

@@ -59,8 +59,6 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
21357, // Varka Silenos Priest 21357, // Varka Silenos Priest
27515, // Varka Backup Wizard 27515, // Varka Backup Wizard
}; };
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
@@ -105,11 +103,10 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
if (st.isCond(2)) if (st.isCond(2))
{ {
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 22_997_520, 5519); addExpAndSp(player, 492760460, 5519);
} }
htmltext = event; htmltext = event;
} }
@@ -160,33 +157,33 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
if (npc.getId() == EMBRYO_SHOOTER) if (npc.getId() == EMBRYO_SHOOTER)
{ {
if (shooterCount < 50) if (shooterCount < 100)
{ {
st.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount); st.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
} }
else if (wizardCount < 50) else if (wizardCount < 100)
{ {
st.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount); st.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((shooterCount >= 50) && (wizardCount >= 50)) if ((shooterCount >= 100) && (wizardCount >= 100))
{ {
st.setCond(2, true); st.setCond(2, true);
} }
} }
else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId())) else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
{ {
if (st.getInt("KillCount_" + EMBRYO_WIZARD) < 50) if (st.getInt("KillCount_" + EMBRYO_WIZARD) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH); embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
} }
} }
else if (st.getInt("KillCount_" + EMBRYO_SHOOTER) < 50) else if (st.getInt("KillCount_" + EMBRYO_SHOOTER) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);

View File

@@ -35,8 +35,6 @@ public final class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
// NPCs // NPCs
private static final int HANSEN = 33853; private static final int HANSEN = 33853;
private static final int COMMANDER_MOS = 27502; private static final int COMMANDER_MOS = 27502;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
@@ -88,11 +86,10 @@ public final class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33853-07.html"; htmltext = "33853-07.html";
} }

View File

@@ -36,8 +36,6 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
private static final int HANSEN = 33853; private static final int HANSEN = 33853;
private static final int CHIEF_HORUS = 27503; private static final int CHIEF_HORUS = 27503;
private static final int KAMPF = 27516; private static final int KAMPF = 27516;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -92,11 +90,10 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 351479151, 1839);
} }
htmltext = "33853-07.html"; htmltext = "33853-07.html";
} }

View File

@@ -60,8 +60,6 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
21342, // Ketra Orc Grand Priest 21342, // Ketra Orc Grand Priest
27512, // Varka Backup Wizard 27512, // Varka Backup Wizard
}; };
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -108,11 +106,10 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
if (qs.isCond(2)) if (qs.isCond(2))
{ {
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 22_997_520, 5519); addExpAndSp(player, 492760460, 5519);
} }
htmltext = event; htmltext = event;
} }
@@ -163,33 +160,33 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
if (npc.getId() == EMBRYO_SHOOTER) if (npc.getId() == EMBRYO_SHOOTER)
{ {
if (shooterCount < 50) if (shooterCount < 100)
{ {
qs.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount); qs.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
} }
else if (wizardCount < 50) else if (wizardCount < 100)
{ {
qs.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount); qs.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((shooterCount >= 50) && (wizardCount >= 50)) if ((shooterCount >= 100) && (wizardCount >= 100))
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId())) else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
{ {
if (qs.getInt("KillCount_" + EMBRYO_WIZARD) < 50) if (qs.getInt("KillCount_" + EMBRYO_WIZARD) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH); embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
} }
} }
else if (qs.getInt("KillCount_" + EMBRYO_SHOOTER) < 50) else if (qs.getInt("KillCount_" + EMBRYO_SHOOTER) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);

View File

@@ -35,8 +35,6 @@ public final class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
// NPCs // NPCs
private static final int LUGONNES = 33852; private static final int LUGONNES = 33852;
private static final int COMMANDER_TAYR = 27500; private static final int COMMANDER_TAYR = 27500;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -90,11 +88,10 @@ public final class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33852-07.html"; htmltext = "33852-07.html";
} }

View File

@@ -36,8 +36,6 @@ public final class Q10427_AssassinationOfTheKetraOrcChief extends Quest
private static final int LUGONNES = 33852; private static final int LUGONNES = 33852;
private static final int CHIEF_BRAKKI = 27501; private static final int CHIEF_BRAKKI = 27501;
private static final int KAMPF = 27516; private static final int KAMPF = 27516;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -92,11 +90,10 @@ public final class Q10427_AssassinationOfTheKetraOrcChief extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33852-07.html"; htmltext = "33852-07.html";
} }

View File

@@ -39,7 +39,6 @@ public final class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
// Items // Items
private static final int SOE_TOWN_OF_GODDARD = 37121; // Scroll of Escape: Town of Goddard private static final int SOE_TOWN_OF_GODDARD = 37121; // Scroll of Escape: Town of Goddard
private static final int SOE_VARKA_SILENOS_BARRACKS = 37034; // Scroll of Escape: Varka Silenos Barracks private static final int SOE_VARKA_SILENOS_BARRACKS = 37034; // Scroll of Escape: Varka Silenos Barracks
private static final int EWS = 959; // Scroll: Enchant Weapon (S-grade)
// Location // Location
private static final Location TELEPORT_LOC = new Location(147491, -56633, -2776); private static final Location TELEPORT_LOC = new Location(147491, -56633, -2776);
// Misc // Misc
@@ -92,11 +91,10 @@ public final class Q10419_KekropusLetterKampfsWhereabouts extends LetterQuest
if (st.isCond(2)) if (st.isCond(2))
{ {
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, EWS, 1);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 1_277_640, 306); addExpAndSp(player, 1277640, 306);
} }
showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_KEKROPUS_AT_LV_81, ExShowScreenMessage.TOP_CENTER, 6000); showOnScreenMsg(player, NpcStringId.GROW_STRONGER_HERE_UNTIL_YOU_RECEIVE_THE_NEXT_LETTER_FROM_KEKROPUS_AT_LV_81, ExShowScreenMessage.TOP_CENTER, 6000);
htmltext = event; htmltext = event;

View File

@@ -59,8 +59,6 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
21357, // Varka Silenos Priest 21357, // Varka Silenos Priest
27515, // Varka Backup Wizard 27515, // Varka Backup Wizard
}; };
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
@@ -105,11 +103,10 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
if (st.isCond(2)) if (st.isCond(2))
{ {
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 22_997_520, 5519); addExpAndSp(player, 492760460, 5519);
} }
htmltext = event; htmltext = event;
} }
@@ -160,33 +157,33 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
if (npc.getId() == EMBRYO_SHOOTER) if (npc.getId() == EMBRYO_SHOOTER)
{ {
if (shooterCount < 50) if (shooterCount < 100)
{ {
st.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount); st.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
} }
else if (wizardCount < 50) else if (wizardCount < 100)
{ {
st.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount); st.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((shooterCount >= 50) && (wizardCount >= 50)) if ((shooterCount >= 100) && (wizardCount >= 100))
{ {
st.setCond(2, true); st.setCond(2, true);
} }
} }
else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId())) else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
{ {
if (st.getInt("KillCount_" + EMBRYO_WIZARD) < 50) if (st.getInt("KillCount_" + EMBRYO_WIZARD) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH); embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
} }
} }
else if (st.getInt("KillCount_" + EMBRYO_SHOOTER) < 50) else if (st.getInt("KillCount_" + EMBRYO_SHOOTER) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);

View File

@@ -35,8 +35,6 @@ public final class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
// NPCs // NPCs
private static final int HANSEN = 33853; private static final int HANSEN = 33853;
private static final int COMMANDER_MOS = 27502; private static final int COMMANDER_MOS = 27502;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
@@ -88,11 +86,10 @@ public final class Q10421_AssassinationOfTheVarkaSilenosCommander extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if (player.getLevel() >= MIN_LEVEL) if (player.getLevel() >= MIN_LEVEL)
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33853-07.html"; htmltext = "33853-07.html";
} }

View File

@@ -36,8 +36,6 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
private static final int HANSEN = 33853; private static final int HANSEN = 33853;
private static final int CHIEF_HORUS = 27503; private static final int CHIEF_HORUS = 27503;
private static final int KAMPF = 27516; private static final int KAMPF = 27516;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -92,11 +90,10 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
st.exitQuest(false, true); st.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 351479151, 1839);
} }
htmltext = "33853-07.html"; htmltext = "33853-07.html";
} }

View File

@@ -60,8 +60,6 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
21342, // Ketra Orc Grand Priest 21342, // Ketra Orc Grand Priest
27512, // Varka Backup Wizard 27512, // Varka Backup Wizard
}; };
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -108,11 +106,10 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
if (qs.isCond(2)) if (qs.isCond(2))
{ {
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 22_997_520, 5519); addExpAndSp(player, 492760460, 5519);
} }
htmltext = event; htmltext = event;
} }
@@ -163,33 +160,33 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
if (npc.getId() == EMBRYO_SHOOTER) if (npc.getId() == EMBRYO_SHOOTER)
{ {
if (shooterCount < 50) if (shooterCount < 100)
{ {
qs.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount); qs.set("KillCount_" + EMBRYO_SHOOTER, ++shooterCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
} }
else if (wizardCount < 50) else if (wizardCount < 100)
{ {
qs.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount); qs.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((shooterCount >= 50) && (wizardCount >= 50)) if ((shooterCount >= 100) && (wizardCount >= 100))
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
} }
else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId())) else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
{ {
if (qs.getInt("KillCount_" + EMBRYO_WIZARD) < 50) if (qs.getInt("KillCount_" + EMBRYO_WIZARD) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH); embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
} }
} }
else if (qs.getInt("KillCount_" + EMBRYO_SHOOTER) < 50) else if (qs.getInt("KillCount_" + EMBRYO_SHOOTER) < 100)
{ {
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000); final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer); addAttackPlayerDesire(embryo, killer);

View File

@@ -35,8 +35,6 @@ public final class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
// NPCs // NPCs
private static final int LUGONNES = 33852; private static final int LUGONNES = 33852;
private static final int COMMANDER_TAYR = 27500; private static final int COMMANDER_TAYR = 27500;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -90,11 +88,10 @@ public final class Q10426_AssassinationOfTheKetraOrcCommander extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33852-07.html"; htmltext = "33852-07.html";
} }

View File

@@ -36,8 +36,6 @@ public final class Q10427_AssassinationOfTheKetraOrcChief extends Quest
private static final int LUGONNES = 33852; private static final int LUGONNES = 33852;
private static final int CHIEF_BRAKKI = 27501; private static final int CHIEF_BRAKKI = 27501;
private static final int KAMPF = 27516; private static final int KAMPF = 27516;
// Items
private static final int EAS = 26353; // Scroll: Enchant Armor (S-grade)
// Misc // Misc
private static final int MIN_LEVEL = 76; private static final int MIN_LEVEL = 76;
private static final int MAX_LEVEL = 80; private static final int MAX_LEVEL = 80;
@@ -92,11 +90,10 @@ public final class Q10427_AssassinationOfTheKetraOrcChief extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", "")); final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
qs.exitQuest(false, true); qs.exitQuest(false, true);
giveItems(player, stoneId, 15); giveItems(player, stoneId, 15);
giveItems(player, EAS, 2);
giveStoryQuestReward(npc, player); giveStoryQuestReward(npc, player);
if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL)) if ((player.getLevel() >= MIN_LEVEL) && (player.getLevel() <= MAX_LEVEL))
{ {
addExpAndSp(player, 7_665_840, 1839); addExpAndSp(player, 327446943, 1839);
} }
htmltext = "33852-07.html"; htmltext = "33852-07.html";
} }