Fixed quest Grim Collector (325).

Author: HD321kbps
Source: 887028655a
This commit is contained in:
MobiusDevelopment
2020-08-08 09:27:11 +00:00
parent 70f9d068a7
commit 95259f62fe
2 changed files with 44 additions and 50 deletions

View File

@@ -133,37 +133,34 @@ public class Q00325_GrimCollector extends Quest
case "30434-06.html": case "30434-06.html":
case "30434-07.html": case "30434-07.html":
{ {
if (hasQuestItems(player, getRegisteredItemIds())) final long head = getQuestItemsCount(player, ZOMBIE_HEAD);
final long heart = getQuestItemsCount(player, ZOMBIE_HEART);
final long liver = getQuestItemsCount(player, ZOMBIE_LIVER);
final long skull = getQuestItemsCount(player, SKULL);
final long rib = getQuestItemsCount(player, RIB_BONE);
final long spine = getQuestItemsCount(player, SPINE);
final long arm = getQuestItemsCount(player, ARM_BONE);
final long thigh = getQuestItemsCount(player, THIGH_BONE);
final long complete = getQuestItemsCount(player, COMPLETE_SKELETON);
final long totalCount = (head + heart + liver + skull + rib + spine + arm + thigh + complete);
if (totalCount > 0)
{ {
final long head = getQuestItemsCount(player, ZOMBIE_HEAD); long sum = ((head * 30) + (heart * 20) + (liver * 20) + (skull * 100) + (rib * 40) + (spine * 14) + (arm * 14) + (thigh * 14));
final long heart = getQuestItemsCount(player, ZOMBIE_HEART); if (totalCount >= 10)
final long liver = getQuestItemsCount(player, ZOMBIE_LIVER);
final long skull = getQuestItemsCount(player, SKULL);
final long rib = getQuestItemsCount(player, RIB_BONE);
final long spine = getQuestItemsCount(player, SPINE);
final long arm = getQuestItemsCount(player, ARM_BONE);
final long thigh = getQuestItemsCount(player, THIGH_BONE);
final long complete = getQuestItemsCount(player, COMPLETE_SKELETON);
final long totalCount = (head + heart + liver + skull + rib + spine + arm + thigh + complete);
if (totalCount > 0)
{ {
long sum = ((head * 30) + (heart * 20) + (liver * 20) + (skull * 100) + (rib * 40) + (spine * 14) + (arm * 14) + (thigh * 14)); sum += 1629;
if (totalCount >= 10)
{
sum += 1629;
}
if (complete > 0)
{
sum += 543 + (complete * 341);
}
giveAdena(player, sum, true);
} }
takeItems(player, -1, getRegisteredItemIds()); if (complete > 0)
{
sum += 543 + (complete * 341);
}
giveAdena(player, sum, true);
} }
takeItems(player, -1, ZOMBIE_HEAD, ZOMBIE_HEART, ZOMBIE_LIVER, SKULL, RIB_BONE, SPINE, ARM_BONE, THIGH_BONE, COMPLETE_SKELETON);
if (event.equals("30434-06.html")) if (event.equals("30434-06.html"))
{ {
qs.exitQuest(true, true); qs.exitQuest(true, true);

View File

@@ -133,37 +133,34 @@ public class Q00325_GrimCollector extends Quest
case "30434-06.html": case "30434-06.html":
case "30434-07.html": case "30434-07.html":
{ {
if (hasQuestItems(player, getRegisteredItemIds())) final long head = getQuestItemsCount(player, ZOMBIE_HEAD);
final long heart = getQuestItemsCount(player, ZOMBIE_HEART);
final long liver = getQuestItemsCount(player, ZOMBIE_LIVER);
final long skull = getQuestItemsCount(player, SKULL);
final long rib = getQuestItemsCount(player, RIB_BONE);
final long spine = getQuestItemsCount(player, SPINE);
final long arm = getQuestItemsCount(player, ARM_BONE);
final long thigh = getQuestItemsCount(player, THIGH_BONE);
final long complete = getQuestItemsCount(player, COMPLETE_SKELETON);
final long totalCount = (head + heart + liver + skull + rib + spine + arm + thigh + complete);
if (totalCount > 0)
{ {
final long head = getQuestItemsCount(player, ZOMBIE_HEAD); long sum = ((head * 30) + (heart * 20) + (liver * 20) + (skull * 100) + (rib * 40) + (spine * 14) + (arm * 14) + (thigh * 14));
final long heart = getQuestItemsCount(player, ZOMBIE_HEART); if (totalCount >= 10)
final long liver = getQuestItemsCount(player, ZOMBIE_LIVER);
final long skull = getQuestItemsCount(player, SKULL);
final long rib = getQuestItemsCount(player, RIB_BONE);
final long spine = getQuestItemsCount(player, SPINE);
final long arm = getQuestItemsCount(player, ARM_BONE);
final long thigh = getQuestItemsCount(player, THIGH_BONE);
final long complete = getQuestItemsCount(player, COMPLETE_SKELETON);
final long totalCount = (head + heart + liver + skull + rib + spine + arm + thigh + complete);
if (totalCount > 0)
{ {
long sum = ((head * 30) + (heart * 20) + (liver * 20) + (skull * 100) + (rib * 40) + (spine * 14) + (arm * 14) + (thigh * 14)); sum += 1629;
if (totalCount >= 10)
{
sum += 1629;
}
if (complete > 0)
{
sum += 543 + (complete * 341);
}
giveAdena(player, sum, true);
} }
takeItems(player, -1, getRegisteredItemIds()); if (complete > 0)
{
sum += 543 + (complete * 341);
}
giveAdena(player, sum, true);
} }
takeItems(player, -1, ZOMBIE_HEAD, ZOMBIE_HEART, ZOMBIE_LIVER, SKULL, RIB_BONE, SPINE, ARM_BONE, THIGH_BONE, COMPLETE_SKELETON);
if (event.equals("30434-06.html")) if (event.equals("30434-06.html"))
{ {
qs.exitQuest(true, true); qs.exitQuest(true, true);