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

Fixed normal quest onKill to match party members.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-04-11 20:21:11 +00:00
parent 4291effdb3
commit d52c927336
12 changed files with 90 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java vendored
View File

@@ -178,7 +178,8 @@ public class Q00581_ThePurificationRitual extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -186,12 +187,12 @@ public class Q00581_ThePurificationRitual extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java vendored
View File

@@ -178,7 +178,8 @@ public class Q00582_WashBloodWithBlood extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -186,12 +187,12 @@ public class Q00582_WashBloodWithBlood extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java vendored
View File

@@ -179,7 +179,8 @@ public class Q00583_MeaningOfSurvival extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -187,12 +188,12 @@ public class Q00583_MeaningOfSurvival extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java vendored
View File

@@ -179,7 +179,8 @@ public class Q00584_NeverSayGoodBye extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -187,12 +188,12 @@ public class Q00584_NeverSayGoodBye extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java vendored
View File

@@ -178,7 +178,8 @@ public class Q00581_ThePurificationRitual extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -186,12 +187,12 @@ public class Q00581_ThePurificationRitual extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java vendored
View File

@@ -178,7 +178,8 @@ public class Q00582_WashBloodWithBlood extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -186,12 +187,12 @@ public class Q00582_WashBloodWithBlood extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java vendored
View File

@@ -179,7 +179,8 @@ public class Q00583_MeaningOfSurvival extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -187,12 +188,12 @@ public class Q00583_MeaningOfSurvival extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java vendored
View File

@@ -179,7 +179,8 @@ public class Q00584_NeverSayGoodBye extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -187,12 +188,12 @@ public class Q00584_NeverSayGoodBye extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00581_ThePurificationRitual/Q00581_ThePurificationRitual.java vendored
View File

@@ -178,7 +178,8 @@ public class Q00581_ThePurificationRitual extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -186,12 +187,12 @@ public class Q00581_ThePurificationRitual extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00582_WashBloodWithBlood/Q00582_WashBloodWithBlood.java vendored
View File

@@ -178,7 +178,8 @@ public class Q00582_WashBloodWithBlood extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -186,12 +187,12 @@ public class Q00582_WashBloodWithBlood extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00583_MeaningOfSurvival/Q00583_MeaningOfSurvival.java vendored
View File

@@ -179,7 +179,8 @@ public class Q00583_MeaningOfSurvival extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -187,12 +188,12 @@ public class Q00583_MeaningOfSurvival extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);

7
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00584_NeverSayGoodBye/Q00584_NeverSayGoodBye.java vendored
View File

@@ -179,7 +179,8 @@ public class Q00584_NeverSayGoodBye extends Quest
QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false); QuestState qs = PARTY_QUEST ? getRandomPartyMemberState(killer, -1, 3, npc) : getQuestState(killer, false);
if ((qs != null) && qs.isCond(KILLING_COND)) if ((qs != null) && qs.isCond(KILLING_COND))
{ {
giveItemRandomly(killer, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true); final PlayerInstance player = qs.getPlayer();
giveItemRandomly(player, npc, MONSTER_DROP, 1, REQUIRED_DROP_COUNT, 1, true);
final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; final int killCount = qs.getInt(KILL_COUNT_VAR) + 1;
if (killCount < REQUIRED_KILL_COUNT) if (killCount < REQUIRED_KILL_COUNT)
@@ -187,12 +188,12 @@ public class Q00584_NeverSayGoodBye extends Quest
qs.set(KILL_COUNT_VAR, killCount); qs.set(KILL_COUNT_VAR, killCount);
} }
if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(killer, MONSTER_DROP) >= REQUIRED_DROP_COUNT)) if ((killCount >= REQUIRED_KILL_COUNT) && (getQuestItemsCount(player, MONSTER_DROP) >= REQUIRED_DROP_COUNT))
{ {
qs.setCond(FINISH_COND, true); qs.setCond(FINISH_COND, true);
} }
sendNpcLogList(killer); sendNpcLogList(player);
} }
return super.onKill(npc, killer, isSummon); return super.onKill(npc, killer, isSummon);