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

Minor faction quest cleanup.

Browse Source
This commit is contained in:
MobiusDev
2017-11-03 13:25:12 +00:00
parent 8f9639f8b3
commit b205e6b989
2 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java vendored
View File

@@ -17,7 +17,6 @@
package quests.Q00775_RetrievingTheChaosFragment; package quests.Q00775_RetrievingTheChaosFragment;
import com.l2jmobius.gameserver.enums.Faction; import com.l2jmobius.gameserver.enums.Faction;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType; import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -108,19 +107,20 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
{ {
if (qs.isCond(2)) if (qs.isCond(2))
{ {
if (player.getFactionLevel(Faction.BLACKBIRD_CLAN) == 0) final int factionLevel = player.getFactionLevel(Faction.BLACKBIRD_CLAN);
if (factionLevel == 0)
{ {
addFactionPoints(player, Faction.BLACKBIRD_CLAN, 100); addFactionPoints(player, Faction.BLACKBIRD_CLAN, 100);
giveItems(player, BASIC_SUPPLY_BOX, 1); giveItems(player, BASIC_SUPPLY_BOX, 1);
addExpAndSp(player, 4522369500L, 10853640); addExpAndSp(player, 4522369500L, 10853640);
} }
else if (player.getFactionLevel(Faction.BLACKBIRD_CLAN) <= 1) else if (factionLevel == 1)
{ {
addFactionPoints(player, Faction.BLACKBIRD_CLAN, 200); addFactionPoints(player, Faction.BLACKBIRD_CLAN, 200);
giveItems(player, INTERMEDIATE_SUPPLY_BOX, 1); giveItems(player, INTERMEDIATE_SUPPLY_BOX, 1);
addExpAndSp(player, 9044739000L, 21707280); addExpAndSp(player, 9044739000L, 21707280);
} }
else if (player.getFactionLevel(Faction.BLACKBIRD_CLAN) >= 2) else if (factionLevel > 1)
{ {
addFactionPoints(player, Faction.BLACKBIRD_CLAN, 300); addFactionPoints(player, Faction.BLACKBIRD_CLAN, 300);
giveItems(player, ADVANCED_SUPPLY_BOX, 1); giveItems(player, ADVANCED_SUPPLY_BOX, 1);
@@ -191,34 +191,32 @@ public class Q00775_RetrievingTheChaosFragment extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{ {
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if (qs != null) if ((qs != null) && qs.isCond(1))
{ {
if ((killer.getFactionLevel(Faction.BLACKBIRD_CLAN) == 0) && (getQuestItemsCount(killer, CHAOS_FRAGMENT) < 250)) final int factionLevel = killer.getFactionLevel(Faction.BLACKBIRD_CLAN);
if (factionLevel == 0)
{ {
if (getQuestItemsCount(killer, CHAOS_FRAGMENT) == 250) giveItems(killer, CHAOS_FRAGMENT, 1, true);
if (getQuestItemsCount(killer, CHAOS_FRAGMENT) >= 300)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
giveItems(killer, CHAOS_FRAGMENT, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((killer.getFactionLevel(Faction.BLACKBIRD_CLAN) >= 1) && (getQuestItemsCount(killer, CHAOS_FRAGMENT) < 500)) else if (factionLevel == 1)
{ {
if (getQuestItemsCount(killer, CHAOS_FRAGMENT) == 500) giveItems(killer, CHAOS_FRAGMENT, 1, true);
if (getQuestItemsCount(killer, CHAOS_FRAGMENT) >= 600)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
giveItems(killer, CHAOS_FRAGMENT, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((killer.getFactionLevel(Faction.BLACKBIRD_CLAN) >= 2) && (getQuestItemsCount(killer, CHAOS_FRAGMENT) < 750)) else if (factionLevel > 1)
{ {
if (getQuestItemsCount(killer, CHAOS_FRAGMENT) == 750) giveItems(killer, CHAOS_FRAGMENT, 1, true);
if (getQuestItemsCount(killer, CHAOS_FRAGMENT) >= 900)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
giveItems(killer, CHAOS_FRAGMENT, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

32
L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00823_DisappearedRaceNewFairy/Q00823_DisappearedRaceNewFairy.java vendored
View File

@@ -17,7 +17,6 @@
package quests.Q00823_DisappearedRaceNewFairy; package quests.Q00823_DisappearedRaceNewFairy;
import com.l2jmobius.gameserver.enums.Faction; import com.l2jmobius.gameserver.enums.Faction;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType; import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -95,19 +94,20 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
{ {
if (qs.isCond(2)) if (qs.isCond(2))
{ {
if (player.getFactionLevel(Faction.MOTHER_TREE_GUARDIANS) == 0) final int factionLevel = player.getFactionLevel(Faction.MOTHER_TREE_GUARDIANS);
if (factionLevel == 0)
{ {
addFactionPoints(player, Faction.MOTHER_TREE_GUARDIANS, 100); addFactionPoints(player, Faction.MOTHER_TREE_GUARDIANS, 100);
giveItems(player, BASIC_SUPPLY_BOX, 1); giveItems(player, BASIC_SUPPLY_BOX, 1);
addExpAndSp(player, 5536944000L, 13288590); addExpAndSp(player, 5536944000L, 13288590);
} }
else if (player.getFactionLevel(Faction.MOTHER_TREE_GUARDIANS) == 1) else if (factionLevel == 1)
{ {
addFactionPoints(player, Faction.MOTHER_TREE_GUARDIANS, 200); addFactionPoints(player, Faction.MOTHER_TREE_GUARDIANS, 200);
giveItems(player, INTERMEDIATE_SUPPLY_BOX, 1); giveItems(player, INTERMEDIATE_SUPPLY_BOX, 1);
addExpAndSp(player, 11073888000L, 26577180); addExpAndSp(player, 11073888000L, 26577180);
} }
else if (player.getFactionLevel(Faction.MOTHER_TREE_GUARDIANS) >= 2) else if (factionLevel > 1)
{ {
addFactionPoints(player, Faction.MOTHER_TREE_GUARDIANS, 300); addFactionPoints(player, Faction.MOTHER_TREE_GUARDIANS, 300);
giveItems(player, ADVANCED_SUPPLY_BOX, 1); giveItems(player, ADVANCED_SUPPLY_BOX, 1);
@@ -168,34 +168,32 @@ public class Q00823_DisappearedRaceNewFairy extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{ {
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc); final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if (qs != null) if ((qs != null) && qs.isCond(1))
{ {
if ((killer.getFactionLevel(Faction.MOTHER_TREE_GUARDIANS) == 0) && (getQuestItemsCount(killer, NYMPH_STAMEN) < 250)) final int factionLevel = killer.getFactionLevel(Faction.MOTHER_TREE_GUARDIANS);
if (factionLevel == 0)
{ {
if (getQuestItemsCount(killer, NYMPH_STAMEN) == 300) giveItems(killer, NYMPH_STAMEN, 1, true);
if (getQuestItemsCount(killer, NYMPH_STAMEN) >= 300)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
giveItems(killer, NYMPH_STAMEN, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((killer.getFactionLevel(Faction.MOTHER_TREE_GUARDIANS) == 1) && (getQuestItemsCount(killer, NYMPH_STAMEN) < 500)) else if (factionLevel == 1)
{ {
if (getQuestItemsCount(killer, NYMPH_STAMEN) == 600) giveItems(killer, NYMPH_STAMEN, 1, true);
if (getQuestItemsCount(killer, NYMPH_STAMEN) >= 600)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
giveItems(killer, NYMPH_STAMEN, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
if ((killer.getFactionLevel(Faction.MOTHER_TREE_GUARDIANS) >= 2) && (getQuestItemsCount(killer, NYMPH_STAMEN) < 750)) else if (factionLevel > 1)
{ {
if (getQuestItemsCount(killer, NYMPH_STAMEN) == 900) giveItems(killer, NYMPH_STAMEN, 1, true);
if (getQuestItemsCount(killer, NYMPH_STAMEN) >= 900)
{ {
qs.setCond(2, true); qs.setCond(2, true);
} }
giveItems(killer, NYMPH_STAMEN, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
} }
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);