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

Code style changes.

Browse Source
This commit is contained in:
MobiusDev
2016-04-26 19:21:19 +00:00
parent 6a13705766
commit fc070c9238
768 changed files with 3338 additions and 4252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ public class Q00017_LightAndDarkness extends Quest
case State.CREATED:
{
final QuestState qs2 = player.getQuestState(Q00015_SweetWhispers.class.getSimpleName());
htmltext = ((qs2 != null) && (qs2.isCompleted())) ? "31517-00.htm" : "31517-06.html";
htmltext = ((qs2 != null) && qs2.isCompleted()) ? "31517-00.htm" : "31517-06.html";
break;
}
case State.STARTED:

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

@@ -122,7 +122,7 @@ public class Q00019_GoToThePastureland extends Quest
}
}
}
else if ((npc.getId() == TUNATUN) && (qs.isCond(1)))
else if ((npc.getId() == TUNATUN) && qs.isCond(1))
{
htmltext = "31537-01.html";
}

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

@@ -123,7 +123,7 @@ public class Q00020_BringUpWithLove extends Quest
}
case 2:
{
htmltext = (!hasQuestItems(player, INNOCENCE_JEWEL)) ? "31537-14.html" : "31537-15.html";
htmltext = !hasQuestItems(player, INNOCENCE_JEWEL) ? "31537-14.html" : "31537-15.html";
break;
}
}

4
trunk/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java vendored
View File

@@ -129,7 +129,7 @@ public final class Q00026_TiredOfWaiting extends Quest
{
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= 80) ? "30655-01.htm" : "30655-00.html");
htmltext = (player.getLevel() >= 80) ? "30655-01.htm" : "30655-00.html";
}
else if (qs.isStarted())
{
@@ -145,7 +145,7 @@ public final class Q00026_TiredOfWaiting extends Quest
{
if (qs.isStarted())
{
htmltext = (hasQuestItems(player, DELIVERY_BOX) ? "31045-01.html" : "31045-09.html");
htmltext = hasQuestItems(player, DELIVERY_BOX) ? "31045-01.html" : "31045-09.html";
}
break;
}

6
trunk/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java vendored
View File

@@ -193,7 +193,7 @@ public final class Q00032_AnObviousLie extends Quest
{
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LVL) ? "30120-01.htm" : "30120-03.htm");
htmltext = (player.getLevel() >= MIN_LVL) ? "30120-01.htm" : "30120-03.htm";
}
else if (qs.isStarted())
{
@@ -224,12 +224,12 @@ public final class Q00032_AnObviousLie extends Quest
}
case 4:
{
htmltext = (hasItem(player, MEDICINAL_HERB) ? "30094-04.html" : "30094-05.html");
htmltext = hasItem(player, MEDICINAL_HERB) ? "30094-04.html" : "30094-05.html";
break;
}
case 5:
{
htmltext = (hasItem(player, SPIRIT_ORE) ? "30094-07.html" : "30094-08.html");
htmltext = hasItem(player, SPIRIT_ORE) ? "30094-07.html" : "30094-08.html";
break;
}
case 6:

4
trunk/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java vendored
View File

@@ -223,7 +223,7 @@ public final class Q00111_ElrokianHuntersProof extends Quest
final ItemChanceHolder item = MOBS_DROP_CHANCES.get(npc.getId());
if (item.getCount() == qs.getMemoState())
{
if (qs.isCond(4) && (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, 50, item.getChance(), true)))
if (qs.isCond(4) && giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, 50, item.getChance(), true))
{
qs.setCond(5);
}
@@ -260,7 +260,7 @@ public final class Q00111_ElrokianHuntersProof extends Quest
{
if (npc.getId() == MARQUEZ)
{
htmltext = ((player.getLevel() >= MIN_LEVEL) ? "32113-01.htm" : "32113-06.html");
htmltext = (player.getLevel() >= MIN_LEVEL) ? "32113-01.htm" : "32113-06.html";
}
break;
}

4
trunk/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java vendored
View File

@@ -187,7 +187,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
}
case "32018-05.html":
{
if (qs.isCond(6) && (hasQuestItems(player, RAFFORTYS_LETTER)))
if (qs.isCond(6) && hasQuestItems(player, RAFFORTYS_LETTER))
{
takeItems(player, RAFFORTYS_LETTER, -1);
qs.setCond(7, true);
@@ -422,7 +422,7 @@ public class Q00115_TheOtherSideOfTruth extends Quest
}
case 2:
{
htmltext = (!hasQuestItems(player, MISAS_LETTER)) ? "32020-05.html" : "32020-06.html";
htmltext = !hasQuestItems(player, MISAS_LETTER) ? "32020-05.html" : "32020-06.html";
break;
}
case 3:

9
trunk/dist/game/data/scripts/quests/Q00120_PavelsLastResearch/Q00120_PavelsLastResearch.java vendored
View File

@@ -1203,12 +1203,9 @@ public final class Q00120_PavelsLastResearch extends Quest
}
}
}
else
else if (checkQ114(player))
{
if (checkQ114(player))
{
html = getAlreadyCompletedMsg(player);
}
html = getAlreadyCompletedMsg(player);
}
break;
}
@@ -1476,6 +1473,6 @@ public final class Q00120_PavelsLastResearch extends Quest
private static boolean checkQ114(L2PcInstance player)
{
final QuestState q114 = player.getQuestState(Q00114_ResurrectionOfAnOldManager.class.getSimpleName());
return ((q114 != null) && q114.isCompleted());
return (q114 != null) && q114.isCompleted();
}
}

21
trunk/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java vendored
View File

@@ -152,22 +152,19 @@ public class Q00134_TempleMissionary extends Quest
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
else
else if (hasQuestItems(player, GIANTS_EXPERIMENTAL_TOOL))
{
if (hasQuestItems(player, GIANTS_EXPERIMENTAL_TOOL))
takeItems(player, GIANTS_EXPERIMENTAL_TOOL, 1);
if (getRandom(100) != 0)
{
takeItems(player, GIANTS_EXPERIMENTAL_TOOL, 1);
if (getRandom(100) != 0)
{
addSpawn(CRUMA_MARSHLANDS_TRAITOR, npc.getX() + 20, npc.getY() + 20, npc.getZ(), npc.getHeading(), false, 60000);
}
}
else if (getRandom(100) < MOBS.get(npc.getId()))
{
giveItems(player, GIANTS_EXPERIMENTAL_TOOL_FRAGMENT, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
addSpawn(CRUMA_MARSHLANDS_TRAITOR, npc.getX() + 20, npc.getY() + 20, npc.getZ(), npc.getHeading(), false, 60000);
}
}
else if (getRandom(100) < MOBS.get(npc.getId()))
{
giveItems(player, GIANTS_EXPERIMENTAL_TOOL_FRAGMENT, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
return super.onKill(npc, player, isSummon);
}

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

@@ -136,7 +136,7 @@ public class Q00135_TempleExecutor extends Quest
return super.onKill(npc, player, isSummon);
}
final QuestState qs = getQuestState(member, false);
if ((getRandom(1000) < MOBS.get(npc.getId())))
if (getRandom(1000) < MOBS.get(npc.getId()))
{
if (getQuestItemsCount(player, STOLEN_CARGO) < ITEM_COUNT)
{

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

@@ -86,7 +86,7 @@ public class Q00137_TempleChampionPart1 extends Quest
}
case "30070-16.html":
{
if (qs.isCond(3) && (hasQuestItems(player, EXECUTOR) && hasQuestItems(player, MISSIONARY)))
if (qs.isCond(3) && hasQuestItems(player, EXECUTOR) && hasQuestItems(player, MISSIONARY))
{
takeItems(player, EXECUTOR, -1);
takeItems(player, MISSIONARY, -1);

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

@@ -76,7 +76,7 @@ public class Q00138_TempleChampionPart2 extends Quest
case "30070-05.html":
{
giveAdena(player, 84593, true);
if ((player.getLevel() < 42))
if (player.getLevel() < 42)
{
addExpAndSp(player, 187062, 11307);
}

4
trunk/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java vendored
View File

@@ -178,12 +178,12 @@ public class Q00139_ShadowFoxPart1 extends Quest
{
case 1:
{
htmltext = (qs.isSet("talk")) ? "30896-11.html" : "30896-05.html";
htmltext = qs.isSet("talk") ? "30896-11.html" : "30896-05.html";
break;
}
case 2:
{
htmltext = (qs.isSet("talk")) ? "30896-18.html" : ((getQuestItemsCount(player, FRAGMENT) >= 10) && (getQuestItemsCount(player, CHEST) >= 1)) ? "30896-15.html" : "30896-14.html";
htmltext = qs.isSet("talk") ? "30896-18.html" : ((getQuestItemsCount(player, FRAGMENT) >= 10) && (getQuestItemsCount(player, CHEST) >= 1)) ? "30896-15.html" : "30896-14.html";
break;
}
}

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

@@ -239,7 +239,7 @@ public class Q00140_ShadowFoxPart2 extends Quest
}
case 2:
{
htmltext = (qs.isSet("talk")) ? "30912-07.html" : "30912-02.html";
htmltext = qs.isSet("talk") ? "30912-07.html" : "30912-02.html";
break;
}
case 3:

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

@@ -143,7 +143,7 @@ public class Q00141_ShadowFoxPart3 extends Quest
return super.onKill(npc, player, isSummon);
}
final QuestState qs = getQuestState(member, false);
if ((getRandom(100) < MOBS.get(npc.getId())))
if (getRandom(100) < MOBS.get(npc.getId()))
{
giveItems(member, PREDECESSORS_REPORT, 1);
if (getQuestItemsCount(member, PREDECESSORS_REPORT) >= REPORT_COUNT)

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

@@ -154,7 +154,7 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
{
final QuestState qs;
if ((npc.getId() == FALLEN_ANGEL))
if (npc.getId() == FALLEN_ANGEL)
{
qs = getQuestState(player, false);
if (qs.isCond(5))

4
trunk/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java vendored
View File

@@ -218,7 +218,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
}
case 2:
{
htmltext = (qs.isSet("talk")) ? "30297-04.html" : "30297-02.html";
htmltext = qs.isSet("talk") ? "30297-04.html" : "30297-02.html";
break;
}
case 3:
@@ -256,7 +256,7 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
}
case 3:
{
htmltext = (qs.isSet("talk")) ? "30612-04.html" : "30612-02.html";
htmltext = qs.isSet("talk") ? "30612-04.html" : "30612-02.html";
break;
}
default:

6
trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java vendored
View File

@@ -810,7 +810,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
}
}
private static final void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop)
private static void dropHerb(L2Npc mob, L2PcInstance player, int[][] drop)
{
final int chance = Rnd.get(100);
for (int[] element : drop)
@@ -823,7 +823,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
}
}
private static final void dropItem(L2Npc mob, L2PcInstance player)
private static void dropItem(L2Npc mob, L2PcInstance player)
{
// To make random drops, we shuffle the droplist every time its used.
Collections.shuffle(DROPLIST);
@@ -844,7 +844,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
buff_counter--;
}
private static final void teleportPlayer(L2PcInstance player, int[] coords, int instanceId)
private static void teleportPlayer(L2PcInstance player, int[] coords, int instanceId)
{
player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
player.setInstanceId(instanceId);

93
trunk/dist/game/data/scripts/quests/Q00177_SplitDestiny/Q00177_SplitDestiny.java vendored
View File

@@ -253,56 +253,53 @@ public class Q00177_SplitDestiny extends Quest
{
htmltext = "33344-12.htm";
}
else if (!player.isSubClassActive() || !player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) || (player.getLevel() < 80))
{
htmltext = "33344-02.htm";
}
else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClassId()))
{
htmltext = "33344-03.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE))
{
htmltext = "33344-sigel.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.TYRR_CANDIDATE))
{
htmltext = "33344-tyrr.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE))
{
htmltext = "33344-othell.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.YUL_CANDIDATE))
{
htmltext = "33344-yul.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.FEOH_CANDIDATE))
{
htmltext = "33344-feoh.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.ISS_CANDIDATE))
{
htmltext = "33344-iss.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.WYNN_CANDIDATE))
{
htmltext = "33344-wynn.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.AEORE_CANDIDATE))
{
htmltext = "33344-aeore.htm";
}
else if (player.hasDualClass())
{
htmltext = "33344-12.htm";
}
else
{
if (!player.isSubClassActive() || !player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) || (player.getLevel() < 80))
{
htmltext = "33344-02.htm";
}
else if (!CategoryData.getInstance().isInCategory(CategoryType.AWAKEN_GROUP, player.getBaseClassId()))
{
htmltext = "33344-03.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.SIGEL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.SIGEL_CANDIDATE))
{
htmltext = "33344-sigel.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.TYRR_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.TYRR_CANDIDATE))
{
htmltext = "33344-tyrr.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.OTHELL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.OTHELL_CANDIDATE))
{
htmltext = "33344-othell.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.YUL_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.YUL_CANDIDATE))
{
htmltext = "33344-yul.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.FEOH_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.FEOH_CANDIDATE))
{
htmltext = "33344-feoh.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.ISS_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.ISS_CANDIDATE))
{
htmltext = "33344-iss.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.WYNN_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.WYNN_CANDIDATE))
{
htmltext = "33344-wynn.htm";
}
else if (CategoryData.getInstance().isInCategory(CategoryType.AEORE_GROUP, player.getBaseClassId()) && player.isInCategory(CategoryType.AEORE_CANDIDATE))
{
htmltext = "33344-aeore.htm";
}
else if (player.hasDualClass())
{
htmltext = "33344-12.htm";
}
else
{
htmltext = "33344-01.htm";
}
htmltext = "33344-01.htm";
}
}
else if ((npc.getId() == ISHUMA) && qs.isStarted())

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

@@ -246,7 +246,7 @@ public final class Q00193_SevenSignsDyingMessage extends Quest
if (npc.getId() == HOLLINT)
{
qs = player.getQuestState(Q00192_SevenSignsSeriesOfDoubt.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "30191-01.htm" : "30191-03.html";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "30191-01.htm" : "30191-03.html";
}
break;
}

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

@@ -235,7 +235,7 @@ public final class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
if (npc.getId() == CLAUDIA_ATHEBALDT)
{
qs = player.getQuestState(Q00194_SevenSignsMammonsContract.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "31001-01.htm" : "31001-02.html";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "31001-01.htm" : "31001-02.html";
}
break;
}

6
trunk/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java vendored
View File

@@ -247,7 +247,7 @@ public final class Q00196_SevenSignsSealOfTheEmperor extends Quest
if (npc.getId() == IASON_HEINE)
{
qs = player.getQuestState(Q00195_SevenSignsSecretRitualOfThePriests.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "30969-01.htm" : "30969-08.html";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "30969-01.htm" : "30969-08.html";
}
break;
}
@@ -298,7 +298,7 @@ public final class Q00196_SevenSignsSealOfTheEmperor extends Quest
{
npc.setScriptValue(player.getObjectId());
}
htmltext = (npc.isScriptValue(player.getObjectId())) ? "32584-01.html" : "32584-06.html";
htmltext = npc.isScriptValue(player.getObjectId()) ? "32584-01.html" : "32584-06.html";
}
break;
}
@@ -358,7 +358,7 @@ public final class Q00196_SevenSignsSealOfTheEmperor extends Quest
{
if (qs.isCond(3) || qs.isCond(4))
{
htmltext = (!hasQuestItems(player, COURT_MAGICIANS_MAGIC_STAFF)) ? "32598-01.html" : "32598-03.html";
htmltext = !hasQuestItems(player, COURT_MAGICIANS_MAGIC_STAFF) ? "32598-01.html" : "32598-03.html";
player.sendPacket(SystemMessageId.BY_USING_THE_COURT_WIZARD_S_MAGIC_STAFF_OPEN_THE_DOOR_ON_WHICH_THE_MAGICIAN_S_BARRIER_IS_PLACED);
}
break;

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

@@ -257,7 +257,7 @@ public final class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
if (npc.getId() == WOOD)
{
qs = player.getQuestState(Q00196_SevenSignsSealOfTheEmperor.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32593-01.htm" : "32593-05.html";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32593-01.htm" : "32593-05.html";
}
break;
}

4
trunk/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java vendored
View File

@@ -208,7 +208,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest
if (npc.getId() == WOOD)
{
qs = player.getQuestState(Q00197_SevenSignsTheSacredBookOfSeal.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32593-01.htm" : "32593-03.html";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32593-01.htm" : "32593-03.html";
}
break;
}
@@ -242,7 +242,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest
{
case 1:
{
htmltext = (isBusy) ? "32597-06.html" : "32597-01.html";
htmltext = isBusy ? "32597-06.html" : "32597-01.html";
break;
}
case 2:

4
trunk/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java vendored
View File

@@ -181,7 +181,7 @@ public class Q00239_WontYouJoinUs extends Quest
{
case 1:
{
htmltext = (hasQuestItems(player, DESTROYED_MACHINE_PIECE)) ? "32643-05.html" : "32643-04.html";
htmltext = hasQuestItems(player, DESTROYED_MACHINE_PIECE) ? "32643-05.html" : "32643-04.html";
break;
}
case 2:
@@ -195,7 +195,7 @@ public class Q00239_WontYouJoinUs extends Quest
}
case 3:
{
htmltext = (hasQuestItems(player, ENCHANTED_GOLEM_FRAGMENT)) ? "32643-08.html" : "32643-09.html";
htmltext = hasQuestItems(player, ENCHANTED_GOLEM_FRAGMENT) ? "32643-08.html" : "32643-09.html";
break;
}
case 4:

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

@@ -125,7 +125,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
{
case 1:
{
htmltext = (!hasQuestItems(player, STAKATO_FANG)) ? "32640-8.html" : "32640-9.html";
htmltext = !hasQuestItems(player, STAKATO_FANG) ? "32640-8.html" : "32640-9.html";
break;
}
case 2:

20
trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java vendored
View File

@@ -129,37 +129,37 @@ public class Q00254_LegendaryTales extends Quest
}
case "25718": // Emerald Horn
{
htmltext = (checkMask(qs, Bosses.EMERALD_HORN) ? "30754-22.html" : "30754-16.html");
htmltext = checkMask(qs, Bosses.EMERALD_HORN) ? "30754-22.html" : "30754-16.html";
break;
}
case "25719": // Dust Rider
{
htmltext = (checkMask(qs, Bosses.DUST_RIDER) ? "30754-23.html" : "30754-17.html");
htmltext = checkMask(qs, Bosses.DUST_RIDER) ? "30754-23.html" : "30754-17.html";
break;
}
case "25720": // Bleeding Fly
{
htmltext = (checkMask(qs, Bosses.BLEEDING_FLY) ? "30754-24.html" : "30754-18.html");
htmltext = checkMask(qs, Bosses.BLEEDING_FLY) ? "30754-24.html" : "30754-18.html";
break;
}
case "25721": // Black Dagger Wing
{
htmltext = (checkMask(qs, Bosses.BLACK_DAGGER) ? "30754-25.html" : "30754-19.html");
htmltext = checkMask(qs, Bosses.BLACK_DAGGER) ? "30754-25.html" : "30754-19.html";
break;
}
case "25722": // Shadow Summoner
{
htmltext = (checkMask(qs, Bosses.SHADOW_SUMMONER) ? "30754-26.html" : "30754-16.html");
htmltext = checkMask(qs, Bosses.SHADOW_SUMMONER) ? "30754-26.html" : "30754-16.html";
break;
}
case "25723": // Spike Slasher
{
htmltext = (checkMask(qs, Bosses.SPIKE_SLASHER) ? "30754-27.html" : "30754-17.html");
htmltext = checkMask(qs, Bosses.SPIKE_SLASHER) ? "30754-27.html" : "30754-17.html";
break;
}
case "25724": // Muscle Bomber
{
htmltext = (checkMask(qs, Bosses.MUSCLE_BOMBER) ? "30754-28.html" : "30754-18.html");
htmltext = checkMask(qs, Bosses.MUSCLE_BOMBER) ? "30754-28.html" : "30754-18.html";
break;
}
case "13467": // Vesper Thrower
@@ -208,11 +208,11 @@ public class Q00254_LegendaryTales extends Quest
final long count = getQuestItemsCount(player, LARGE_DRAGON_SKULL);
if (qs.isCond(1))
{
htmltext = ((count > 0) ? "30754-14.htm" : "30754-06.html");
htmltext = (count > 0) ? "30754-14.htm" : "30754-06.html";
}
else if (qs.isCond(2))
{
htmltext = ((count < 7) ? "30754-12.htm" : "30754-07.html");
htmltext = (count < 7) ? "30754-12.htm" : "30754-07.html";
}
break;
}
@@ -272,6 +272,6 @@ public class Q00254_LegendaryTales extends Quest
private static boolean checkMask(QuestState qs, Bosses boss)
{
final int pos = boss.getMask();
return ((qs.getInt("raids") & pos) == pos);
return (qs.getInt("raids") & pos) == pos;
}
}

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

@@ -146,7 +146,7 @@ public class Q00278_HomeSecurity extends Quest
{
case 18905: // Farm Ravager (Crazy)
{
final int itemCount = ((getRandom(1000) < 486) ? getRandom(6) + 1 : getRandom(5) + 1);
final int itemCount = (getRandom(1000) < 486) ? getRandom(6) + 1 : getRandom(5) + 1;
if (giveItemRandomly(qs.getPlayer(), npc, SEL_MAHUM_MANE, itemCount, SEL_MAHUM_MANE_COUNT, 1.0, true))
{
qs.setCond(2, true);

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

@@ -135,7 +135,7 @@ public final class Q00279_TargetOfOpportunity extends Quest
return htmltext;
}
private static final boolean haveAllExceptThis(L2PcInstance player, int idx)
private static boolean haveAllExceptThis(L2PcInstance player, int idx)
{
for (int i = 0; i < SEAL_COMPONENTS.length; i++)
{

26
trunk/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java vendored
View File

@@ -31,19 +31,19 @@ import com.l2jmobius.gameserver.network.serverpackets.RadarControl;
public class Q00307_ControlDeviceOfTheGiants extends Quest
{
// NPC
private final static int DROPH = 32711;
private static final int DROPH = 32711;
// RB
private final static int GORGOLOS = 25681;
private final static int LAST_TITAN_UTENUS = 25684;
private final static int GIANT_MARPANAK = 25680;
private final static int HEKATON_PRIME = 25687;
private static final int GORGOLOS = 25681;
private static final int LAST_TITAN_UTENUS = 25684;
private static final int GIANT_MARPANAK = 25680;
private static final int HEKATON_PRIME = 25687;
// Items
private final static int SUPPORT_ITEMS = 14850;
private final static int CET_1_SHEET = 14851;
private final static int CET_2_SHEET = 14852;
private final static int CET_3_SHEET = 14853;
private static final int SUPPORT_ITEMS = 14850;
private static final int CET_1_SHEET = 14851;
private static final int CET_2_SHEET = 14852;
private static final int CET_3_SHEET = 14853;
// Misc
private final static int RESPAWN_DELAY = 3600000; // 1 hour
private static final int RESPAWN_DELAY = 3600000; // 1 hour
private static L2Npc hekaton;
public Q00307_ControlDeviceOfTheGiants()
@@ -71,7 +71,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
if (player.getLevel() >= 79)
{
qs.startQuest();
htmltext = (hasQuestItems(player, CET_1_SHEET, CET_2_SHEET, CET_3_SHEET)) ? "32711-04a.html" : "32711-04.html";
htmltext = hasQuestItems(player, CET_1_SHEET, CET_2_SHEET, CET_3_SHEET) ? "32711-04a.html" : "32711-04.html";
}
break;
}
@@ -101,7 +101,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
return "32711-09.html";
}
final String respawn = loadGlobalQuestVar("Respawn");
final long remain = (!respawn.isEmpty()) ? Long.parseLong(respawn) - System.currentTimeMillis() : 0;
final long remain = !respawn.isEmpty() ? Long.parseLong(respawn) - System.currentTimeMillis() : 0;
if (remain > 0)
{
return "32711-09a.html";
@@ -203,7 +203,7 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
}
else if (qs.isCond(1))
{
htmltext = (!hasQuestItems(player, CET_1_SHEET, CET_2_SHEET, CET_3_SHEET)) ? "32711-07.html" : "32711-08.html";
htmltext = !hasQuestItems(player, CET_1_SHEET, CET_2_SHEET, CET_3_SHEET) ? "32711-07.html" : "32711-08.html";
}
else if (qs.isCond(2))
{

4
trunk/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java vendored
View File

@@ -137,9 +137,9 @@ public final class Q00326_VanquishRemnants extends Quest
{
giveItems(player, BLACK_LION_MARK, 1);
}
giveAdena(player, ((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true);
giveAdena(player, (red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0), true);
takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE);
htmltext = (sum >= 100) ? (hasQuestItems(player, BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html";
htmltext = (sum >= 100) ? hasQuestItems(player, BLACK_LION_MARK) ? "30435-09.html" : "30435-06.html" : "30435-05.html";
}
else
{

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

@@ -1459,7 +1459,7 @@ public final class Q00336_CoinsOfMagic extends Quest
{
case 42:
{
if ((getQuestItemsCount(player, ITEM_1) >= (10 * mul * ITEM_1_MUL)))
if (getQuestItemsCount(player, ITEM_1) >= (10 * mul * ITEM_1_MUL))
{
takeItems(player, ITEM_1, 10 * mul * ITEM_1_MUL);
giveItems(player, REWARD_1, 1 * mul);

33
trunk/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java vendored
View File

@@ -252,11 +252,11 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
{
htmltext = "30753-01.htm";
}
else if ((qs.isCond(1)) && (getQuestItemsCount(player, MARK_OF_WATCHMAN) < 4))
else if (qs.isCond(1) && (getQuestItemsCount(player, MARK_OF_WATCHMAN) < 4))
{
htmltext = "30753-06.html";
}
else if ((qs.isCond(1)) && (getQuestItemsCount(player, MARK_OF_WATCHMAN) >= 4))
else if (qs.isCond(1) && (getQuestItemsCount(player, MARK_OF_WATCHMAN) >= 4))
{
htmltext = "30753-07.html";
}
@@ -349,7 +349,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
{
if (qs.getInt("drop3") == 1)
{
if ((hasQuestItems(player, KRANROT_SKIN)) && (hasQuestItems(player, HAMRUT_LEG)))
if (hasQuestItems(player, KRANROT_SKIN) && hasQuestItems(player, HAMRUT_LEG))
{
takeItems(player, KRANROT_SKIN, 1);
takeItems(player, HAMRUT_LEG, 1);
@@ -380,7 +380,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
{
if (qs.getInt("drop4") == 1)
{
if ((hasQuestItems(player, MARSH_DRAKE_TALONS)) && (hasQuestItems(player, MARSH_STALKER_HORN)))
if (hasQuestItems(player, MARSH_DRAKE_TALONS) && hasQuestItems(player, MARSH_STALKER_HORN))
{
takeItems(player, MARSH_DRAKE_TALONS, 1);
takeItems(player, MARSH_STALKER_HORN, 1);
@@ -419,7 +419,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
}
case 1:
{
if ((hasQuestItems(player, FIRST_FRAGMENT_OF_ABYSS_JEWEL)) && (hasQuestItems(player, MARA_FANG)))
if (hasQuestItems(player, FIRST_FRAGMENT_OF_ABYSS_JEWEL) && hasQuestItems(player, MARA_FANG))
{
takeItems(player, FIRST_FRAGMENT_OF_ABYSS_JEWEL, 1);
takeItems(player, MARA_FANG, 1);
@@ -464,7 +464,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
}
case 1:
{
if ((hasQuestItems(player, SECOND_FRAGMENT_OF_ABYSS_JEWEL)) && (hasQuestItems(player, MUSFEL_FANG)))
if (hasQuestItems(player, SECOND_FRAGMENT_OF_ABYSS_JEWEL) && hasQuestItems(player, MUSFEL_FANG))
{
takeItems(player, SECOND_FRAGMENT_OF_ABYSS_JEWEL, 1);
takeItems(player, MUSFEL_FANG, 1);
@@ -497,7 +497,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
}
case GILMORE:
{
if ((qs.isCond(2)) || (qs.isCond(1)))
if (qs.isCond(2) || qs.isCond(1))
{
htmltext = "30754-01.html";
}
@@ -522,7 +522,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
}
case THEODRIC:
{
if ((qs.isCond(1)) || (qs.isCond(2)))
if (qs.isCond(1) || qs.isCond(2))
{
htmltext = "30755-01.html";
}
@@ -580,16 +580,13 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
{
spawn = jewel3;
}
else if (npcId == ABYSSAL_JEWEL_2)
{
spawn = jewel2;
}
else
{
if (npcId == ABYSSAL_JEWEL_2)
{
spawn = jewel2;
}
else
{
spawn = jewel1;
}
spawn = jewel1;
}
if (spawn)
{
@@ -677,7 +674,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
}
case BLOOD_QUEEN:
{
if (qs.isCond(1) && (getRandom(100) < 70) && (qs.getInt("drop1") == 1) && (!hasQuestItems(player, REMAINS_OF_SACRIFIED)))
if (qs.isCond(1) && (getRandom(100) < 70) && (qs.getInt("drop1") == 1) && !hasQuestItems(player, REMAINS_OF_SACRIFIED))
{
for (int i = 0; i < 10; i++)
{
@@ -688,7 +685,7 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
}
case HARIT_LIZARDMAN_SHAMAN:
{
if (qs.isCond(1) && (getRandom(100) < 70) && (qs.getInt("drop2") == 1) && (!hasQuestItems(player, TOTEM_OF_LAND_DRAGON)))
if (qs.isCond(1) && (getRandom(100) < 70) && (qs.getInt("drop2") == 1) && !hasQuestItems(player, TOTEM_OF_LAND_DRAGON))
{
for (int i = 0; i < 3; i++)
{

10
trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java vendored
View File

@@ -425,12 +425,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
// Fail if the killer isn't in the _absorbersList of this L2Attackable and mob is not boss
final AbsorberInfo ai = mob.getAbsorbersList().get(killer.getObjectId());
boolean isSuccess = true;
if ((ai == null) || (ai.getObjectId() != killer.getObjectId()))
{
isSuccess = false;
}
boolean isSuccess = (ai != null) && (ai.getObjectId() == killer.getObjectId());
// Check if the soul crystal was used when HP of this L2Attackable wasn't higher than half of it
if ((ai != null) && (ai.getAbsorbedHp() > (mob.getMaxHp() / 2.0)))
{
@@ -466,8 +461,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
{
if (killer.getParty() != null)
{
final List<L2PcInstance> luckyParty = new ArrayList<>();
luckyParty.addAll(killer.getParty().getMembers());
final List<L2PcInstance> luckyParty = new ArrayList<>(killer.getParty().getMembers());
while ((getRandom(100) < 33) && !luckyParty.isEmpty())
{
final L2PcInstance lucky = luckyParty.remove(getRandom(luckyParty.size()));

4
trunk/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java vendored
View File

@@ -125,11 +125,11 @@ public final class Q00357_WarehouseKeepersAmbition extends Quest
String htmltext = getNoQuestMsg(talker);
if (qs.isCreated())
{
htmltext = ((talker.getLevel() < MIN_LVL) ? "30686-01.html" : "30686-02.htm");
htmltext = (talker.getLevel() < MIN_LVL) ? "30686-01.html" : "30686-02.htm";
}
else if (qs.isStarted())
{
htmltext = (hasQuestItems(talker, JADE_CRYSTAL)) ? "30686-07.html" : "30686-06.html";
htmltext = hasQuestItems(talker, JADE_CRYSTAL) ? "30686-07.html" : "30686-06.html";
}
return htmltext;
}

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

@@ -125,7 +125,7 @@ public final class Q00359_ForASleeplessDeadman extends Quest
String htmltext = getNoQuestMsg(player);
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= MIN_LEVEL) ? "30857-01.htm" : "30857-06.html");
htmltext = (player.getLevel() >= MIN_LEVEL) ? "30857-01.htm" : "30857-06.html";
}
else if (qs.isStarted())
{

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

@@ -217,7 +217,7 @@ public final class Q00371_ShrieksOfGhosts extends Quest
{
if (npc.getId() == REVA)
{
htmltext = (hasQuestItems(player, ANCIENT_PORCELAIN)) ? "30867-04.html" : "30867-10.html";
htmltext = hasQuestItems(player, ANCIENT_PORCELAIN) ? "30867-04.html" : "30867-10.html";
}
else
{

6
trunk/dist/game/data/scripts/quests/Q00372_LegacyOfInsolence/Q00372_LegacyOfInsolence.java vendored
View File

@@ -649,12 +649,8 @@ public final class Q00372_LegacyOfInsolence extends Quest
{
giveAdena(player, 4000, true);
}
htmltext = "30929-02.html";
}
else
{
htmltext = "30929-02.html";
}
htmltext = "30929-02.html";
break;
}
case CLAUDIA_ATHEBALDT:

4
trunk/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java vendored
View File

@@ -120,11 +120,11 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html");
htmltext = (player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html";
}
else if (qs.isStarted())
{
htmltext = (hasQuestItems(player, BOOK1, BOOK2, BOOK3, BOOK4, BOOK5) ? "31147-03.html" : "31147-02a.html");
htmltext = hasQuestItems(player, BOOK1, BOOK2, BOOK3, BOOK4, BOOK5) ? "31147-03.html" : "31147-02a.html";
}
return htmltext;
}

6
trunk/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java vendored
View File

@@ -110,7 +110,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
final int npcId = npc.getId();
if (MOBS1.containsKey(npcId))
{
giveItemRandomly(qs.getPlayer(), npc, TITAN_ANCIENT_BOOK, ((getRandom(1000) < MOBS1.get(npcId)) ? 3 : 2), 0, 1.0, true);
giveItemRandomly(qs.getPlayer(), npc, TITAN_ANCIENT_BOOK, (getRandom(1000) < MOBS1.get(npcId)) ? 3 : 2, 0, 1.0, true);
}
else
{
@@ -132,11 +132,11 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
if (qs.isCreated())
{
htmltext = ((player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html");
htmltext = (player.getLevel() >= 79) ? "31147-01.htm" : "31147-00.html";
}
else if (qs.isStarted())
{
htmltext = (hasQuestItems(player, BOOK1, BOOK2, BOOK3, BOOK4, BOOK5) ? "31147-03.html" : "31147-02a.html");
htmltext = hasQuestItems(player, BOOK1, BOOK2, BOOK3, BOOK4, BOOK5) ? "31147-03.html" : "31147-02a.html";
}
return htmltext;
}

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

@@ -106,7 +106,7 @@ public final class Q00382_KailsMagicCoin extends Quest
String htmltext = getNoQuestMsg(talker);
if (qs.isCreated())
{
htmltext = (((talker.getLevel() >= MIN_LVL) && hasQuestItems(talker, ROYAL_MEMBERSHIP)) ? "30687-02.htm" : "30687-01.htm");
htmltext = ((talker.getLevel() >= MIN_LVL) && hasQuestItems(talker, ROYAL_MEMBERSHIP)) ? "30687-02.htm" : "30687-01.htm";
}
else if (qs.isStarted())
{

4
trunk/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java vendored
View File

@@ -340,7 +340,7 @@ public final class Q00386_StolenDignity extends Quest
for (int i0 = 0; i0 < 9; i0 = i0 + 1)
{
final int i1 = getNumberFromBingoBoard(qs, i0);
html = html.replace("<?FontColor" + (i0 + 1) + "?>", (isSelectedBingoNumber(qs, i1)) ? "ff0000" : "ffffff");
html = html.replace("<?FontColor" + (i0 + 1) + "?>", isSelectedBingoNumber(qs, i1) ? "ff0000" : "ffffff");
html = html.replace("<?Cell" + (i0 + 1) + "?>", i1 + "");
}
return html;
@@ -353,7 +353,7 @@ public final class Q00386_StolenDignity extends Quest
selectBingoNumber(qs, num);
final int i3 = getMatchedBingoLineCount(qs);
String html;
if ((i3 == 3) && ((getBingoSelectCount(qs)) == 6))
if ((i3 == 3) && (getBingoSelectCount(qs) == 6))
{
reward(player, qs, 4);
html = getHtm(player.getHtmlPrefix(), "30843-22.html");

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

@@ -438,7 +438,7 @@ public final class Q00420_LittleWing extends Quest
{
if (npc.getId() == COOPER)
{
htmltext = ((talker.getLevel() >= MIN_LVL) ? "30829-01.htm" : "30829-03.html");
htmltext = (talker.getLevel() >= MIN_LVL) ? "30829-01.htm" : "30829-03.html";
}
break;
}

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

@@ -121,7 +121,7 @@ public class Q00431_WeddingMarch extends Quest
}
case State.STARTED:
{
htmltext = (qs.isCond(1)) ? "31042-03.html" : "31042-04.html";
htmltext = qs.isCond(1) ? "31042-03.html" : "31042-04.html";
break;
}
}

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

@@ -125,7 +125,7 @@ public class Q00432_BirthdayPartySong extends Quest
}
case State.STARTED:
{
htmltext = (qs.isCond(1)) ? "31043-03.html" : "31043-04.html";
htmltext = qs.isCond(1) ? "31043-03.html" : "31043-04.html";
break;
}
}

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

@@ -128,7 +128,7 @@ public class Q00450_GraveRobberRescue extends Quest
{
if (qs.isCond(1))
{
htmltext = (!hasQuestItems(player, EVIDENCE_OF_MIGRATION)) ? "32650-08.html" : "32650-09.html";
htmltext = !hasQuestItems(player, EVIDENCE_OF_MIGRATION) ? "32650-08.html" : "32650-09.html";
}
else
{

28
trunk/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java vendored
View File

@@ -67,25 +67,22 @@ public class Q00452_FindingtheLostSoldiers extends Quest
qs.startQuest();
}
}
else
else if (qs.isCond(1))
{
if (qs.isCond(1))
if (getRandom(10) < 5)
{
if (getRandom(10) < 5)
{
giveItems(player, TAG_ID, 1);
}
else
{
htmltext = "corpse-3.html";
}
qs.setCond(2, true);
npc.deleteMe();
giveItems(player, TAG_ID, 1);
}
else
{
htmltext = "corpse-3.html";
}
qs.setCond(2, true);
npc.deleteMe();
}
else
{
htmltext = "corpse-3.html";
}
return htmltext;
}
@@ -134,12 +131,9 @@ public class Q00452_FindingtheLostSoldiers extends Quest
break;
}
}
else
else if (qs.isCond(1))
{
if (qs.isCond(1))
{
htmltext = "corpse-1.html";
}
htmltext = "corpse-1.html";
}
return htmltext;
}

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

@@ -196,7 +196,7 @@ public class Q00455_WingsOfSand extends Quest
* Reward the player.
* @param qs the quest state of the player to reward
*/
private static final void giveItems(QuestState qs)
private static void giveItems(QuestState qs)
{
final L2PcInstance player = qs.getPlayer();
int chance;

4
trunk/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java vendored
View File

@@ -203,14 +203,14 @@ public final class Q00456_DontKnowDontCare extends Quest
qs.setState(State.CREATED);
// intentional fall-through
case State.CREATED:
htmltext = ((player.getLevel() >= MIN_LEVEL) ? "32864-01.htm" : "32864-03.html");
htmltext = (player.getLevel() >= MIN_LEVEL) ? "32864-01.htm" : "32864-03.html";
break;
case State.STARTED:
switch (qs.getCond())
{
case 1:
{
htmltext = (hasAtLeastOneQuestItem(player, getRegisteredItemIds()) ? "32864-09.html" : "32864-08.html");
htmltext = hasAtLeastOneQuestItem(player, getRegisteredItemIds()) ? "32864-09.html" : "32864-08.html";
break;
}
case 2:

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

@@ -244,6 +244,6 @@ public final class Q00457_LostAndFound extends Quest
private void broadcastNpcSay(L2Npc npc, L2PcInstance player, NpcStringId stringId, boolean whisper)
{
((whisper) ? player : npc).sendPacket(new NpcSay(npc.getObjectId(), ((whisper) ? ChatType.NPC_WHISPER : ChatType.NPC_GENERAL), npc.getId(), stringId));
(whisper ? player : npc).sendPacket(new NpcSay(npc.getObjectId(), (whisper ? ChatType.NPC_WHISPER : ChatType.NPC_GENERAL), npc.getId(), stringId));
}
}

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

@@ -249,19 +249,16 @@ public class Q00458_PerfectForm extends Quest
{
qs.set("overhitsCritical", String.valueOf(qs.getInt("overhitsCritical") + 1)); // memoStateEx 2
}
qs.set("overhitsConsecutive", String.valueOf((qs.getInt("overhitsConsecutive") + 1))); // memoStateEx 3
qs.set("overhitsConsecutive", String.valueOf(qs.getInt("overhitsConsecutive") + 1)); // memoStateEx 3
/*
* Retail logic (makes for a long/messy string in database): int i0 = overhitsConsecutive % 100; int i1 = overhitsConsecutive - (i0 * 100); if (i0 < i1) { st.set("overhitsConsecutive", String.valueOf((i1 * 100) + i1)); }
*/
}
else
// st.set("overhitsConsecutive", String.valueOf((st.getInt("overhitsConsecutive") % 100) * 100));
else if (qs.getInt("overhitsConsecutive") > 0)
{
// st.set("overhitsConsecutive", String.valueOf((st.getInt("overhitsConsecutive") % 100) * 100));
if (qs.getInt("overhitsConsecutive") > 0)
{
// avoid writing to database if variable is already zero
qs.set("overhitsConsecutive", "0");
}
// avoid writing to database if variable is already zero
qs.set("overhitsConsecutive", "0");
}
if ((qs.getInt("18879") == 10) && (qs.getInt("18886") == 10) && (qs.getInt("18893") == 10) && (qs.getInt("18900") == 10))

17
trunk/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java vendored
View File

@@ -239,18 +239,15 @@ public class Q00463_IMustBeaGenius extends Quest
{
htmltext = "32069-04.html";
}
else if (qs.getInt("var") == 1)
{
htmltext = "32069-06a.html";
}
else
{
if (qs.getInt("var") == 1)
{
htmltext = "32069-06a.html";
}
else
{
takeItems(player, COLLECTION, -1);
qs.set("var", "1");
htmltext = "32069-06.html";
}
takeItems(player, COLLECTION, -1);
qs.set("var", "1");
htmltext = "32069-06.html";
}
break;
}

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

@@ -131,7 +131,7 @@ public class Q00470_DivinityProtector extends Quest
}
case AGRIPEL:
{
if ((qs.isCond(2)) && (getQuestItemsCount(player, REMNANT_ASH) >= 20))
if (qs.isCond(2) && (getQuestItemsCount(player, REMNANT_ASH) >= 20))
{
takeItems(player, REMNANT_ASH, 20);
giveItems(player, ADENA);

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

@@ -121,7 +121,7 @@ public class Q00485_HotSpringWater extends Quest
}
case WALDERAL:
{
if ((qs.isCond(2)) && (getQuestItemsCount(player, HOT_SPRINGS_WATER_SAMPLE) >= 40))
if (qs.isCond(2) && (getQuestItemsCount(player, HOT_SPRINGS_WATER_SAMPLE) >= 40))
{
takeItems(player, HOT_SPRINGS_WATER_SAMPLE, -1);
giveItems(player, ADENA);

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

@@ -568,7 +568,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest
{
if (lqs != null)
{
if ((qs.getMemoState() == 1000))
if (qs.getMemoState() == 1000)
{
if (!player.isClanLeader())
{
@@ -596,11 +596,11 @@ public final class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30645-05.html";
}
}
else if ((qs.getMemoState() == 3000))
else if (qs.getMemoState() == 3000)
{
htmltext = "30645-07.html";
}
else if ((qs.getMemoState() > 3000))
else if (qs.getMemoState() > 3000)
{
htmltext = "30645-08.html";
}
@@ -655,7 +655,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest
{
if (lqs != null)
{
if ((qs.getMemoState() == 4000))
if (qs.getMemoState() == 4000)
{
if (!player.isClanLeader())
{
@@ -670,7 +670,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30764-04.html";
}
}
else if ((qs.getMemoState() == 5000))
else if (qs.getMemoState() == 5000)
{
if (getQuestItemsCount(player, SPITEFUL_SOUL_ENERGY) < 10)
{
@@ -684,7 +684,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest
htmltext = "30764-08a.html";
}
}
else if ((qs.getMemoState() >= 6000))
else if (qs.getMemoState() >= 6000)
{
htmltext = "30764-09.html";
}

8
trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java vendored
View File

@@ -114,9 +114,7 @@ public final class Q00511_AwlUnderFoot extends Quest
}
}
private static final boolean debug = false;
private static final long REENTERTIME = 14400000;
private static final long RAID_SPAWN_DELAY = 120000;
private final Map<Integer, FortDungeon> _fortDungeons = new HashMap<>(21);
@@ -191,10 +189,6 @@ public final class Q00511_AwlUnderFoot extends Quest
private String checkConditions(L2PcInstance player)
{
if (debug)
{
return null;
}
final L2Party party = player.getParty();
if (party == null)
{
@@ -346,7 +340,7 @@ public final class Q00511_AwlUnderFoot extends Quest
@Override
public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isSummon)
{
final L2Playable attacker = (isSummon ? player.getServitors().values().stream().findFirst().orElse(player.getPet()) : player);
final L2Playable attacker = isSummon ? player.getServitors().values().stream().findFirst().orElse(player.getPet()) : player;
if ((attacker.getLevel() - npc.getLevel()) >= 9)
{
if ((attacker.getBuffCount() > 0) || (attacker.getDanceCount() > 0))

4
trunk/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java vendored
View File

@@ -96,7 +96,7 @@ public class Q00553_OlympiadUndefeated extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isStarted() && (qs.isCond(1)))
if ((qs != null) && qs.isStarted() && qs.isCond(1))
{
final int matches = qs.getInt("undefeatable") + 1;
qs.set("undefeatable", String.valueOf(matches));
@@ -140,7 +140,7 @@ public class Q00553_OlympiadUndefeated extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isStarted() && (qs.isCond(1)))
if ((qs != null) && qs.isStarted() && qs.isCond(1))
{
qs.unset("undefeatable");
takeItems(player, WIN_CONF_2, -1);

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

@@ -146,7 +146,7 @@ public final class Q00603_DaimonTheWhiteEyedPart1 extends Quest
{
if (npc.getId() == EYE_OF_ARGOS)
{
htmltext = ((talker.getLevel() < MIN_LVL) ? "31683-02.html" : "31683-01.htm");
htmltext = (talker.getLevel() < MIN_LVL) ? "31683-02.html" : "31683-01.htm";
}
break;
}

37
trunk/dist/game/data/scripts/quests/Q00604_DaimonTheWhiteEyedPart2/Q00604_DaimonTheWhiteEyedPart2.java vendored
View File

@@ -231,36 +231,33 @@ public final class Q00604_DaimonTheWhiteEyedPart2 extends Quest
}
else if (qs.getMemoState() >= 22)
{
htmltext = (hasQuestItems(player, ESSENCE_OF_DAIMON)) ? "31683-06.html" : "31683-09.html";
htmltext = hasQuestItems(player, ESSENCE_OF_DAIMON) ? "31683-06.html" : "31683-09.html";
}
}
else
else if (qs.isMemoState(11))
{
if (qs.isMemoState(11))
if (hasQuestItems(player, SUMMON_CRYSTAL))
{
if (hasQuestItems(player, SUMMON_CRYSTAL))
{
htmltext = "31541-01.html";
}
htmltext = "31541-01.html";
}
else if (qs.isMemoState(21))
}
else if (qs.isMemoState(21))
{
if (!isDaimonSpawned())
{
if (!isDaimonSpawned())
{
addSpawn(DAIMON_THE_WHITE_EYED, DAIMON_THE_WHITE_EYED_LOC);
npc.deleteMe();
htmltext = "31541-02.html";
}
else
{
htmltext = "31541-03.html";
}
addSpawn(DAIMON_THE_WHITE_EYED, DAIMON_THE_WHITE_EYED_LOC);
npc.deleteMe();
htmltext = "31541-02.html";
}
else if (qs.getMemoState() >= 22)
else
{
htmltext = "31541-05.html";
htmltext = "31541-03.html";
}
}
else if (qs.getMemoState() >= 22)
{
htmltext = "31541-05.html";
}
}
return htmltext;
}

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

@@ -181,7 +181,7 @@ public final class Q00625_TheFinestIngredientsPart2 extends Quest
{
if (talker.getLevel() >= MIN_LVL)
{
htmltext = (hasItem(talker, SOY_SOURCE_JAR)) ? "31521-01.htm" : "31521-02.htm";
htmltext = hasItem(talker, SOY_SOURCE_JAR) ? "31521-01.htm" : "31521-02.htm";
}
else
{

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

@@ -133,7 +133,7 @@ public class Q00626_ADarkTwilight extends Quest
if (partyMember != null)
{
final QuestState qs = getQuestState(partyMember, false);
final float chance = (MONSTERS.get(npc.getId()) * Config.RATE_QUEST_DROP);
final float chance = MONSTERS.get(npc.getId()) * Config.RATE_QUEST_DROP;
if (getRandom(1000) < chance)
{
giveItems(partyMember, BLOOD_OF_SAINT, 1);

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

@@ -184,7 +184,7 @@ public class Q00627_HeartInSearchOfPower extends Quest
if (partyMember != null)
{
final QuestState qs = getQuestState(partyMember, false);
final float chance = (MONSTERS.get(npc.getId()) * Config.RATE_QUEST_DROP);
final float chance = MONSTERS.get(npc.getId()) * Config.RATE_QUEST_DROP;
if (getRandom(1000) < chance)
{
giveItems(partyMember, BEAD_OF_OBEDIENCE, 1);

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

@@ -135,7 +135,7 @@ public class Q00641_AttackSailren extends Quest
}
case State.STARTED:
{
htmltext = (qs.isCond(1)) ? "32109-1a.html" : "32109-2.html";
htmltext = qs.isCond(1) ? "32109-1a.html" : "32109-2.html";
break;
}
}

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

@@ -153,7 +153,7 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
}
else if (qs.isStarted())
{
htmltext = (hasAtLeastOneQuestItem(player, DINOSAUR_TISSUE, DINOSAUR_EGG)) ? "32105-08.html" : "32105-07.html";
htmltext = hasAtLeastOneQuestItem(player, DINOSAUR_TISSUE, DINOSAUR_EGG) ? "32105-08.html" : "32105-07.html";
}
return htmltext;
}

4
trunk/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java vendored
View File

@@ -192,7 +192,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
if (Util.contains(MOBS1, npcId))
{
final float chance = (CHANCE_MOBS1 * Config.RATE_QUEST_DROP);
final float chance = CHANCE_MOBS1 * Config.RATE_QUEST_DROP;
if (getRandom(1000) < chance)
{
rewardItems(partyMember, BONES_OF_A_PLAINS_DINOSAUR, 2);
@@ -239,7 +239,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
{
if (npc.getId() == SINGSING)
{
htmltext = (hasQuestItems(player, BONES_OF_A_PLAINS_DINOSAUR)) ? "32106-08.html" : "32106-14.html";
htmltext = hasQuestItems(player, BONES_OF_A_PLAINS_DINOSAUR) ? "32106-08.html" : "32106-14.html";
}
else if (npc.getId() == KARAKAWEI)
{

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

@@ -114,7 +114,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
case "ACCEPT":
{
qs.startQuest();
if ((q115 != null) && (q115.isCompleted()))
if ((q115 != null) && q115.isCompleted())
{
htmltext = "32020-04.htm";
}
@@ -200,7 +200,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
{
if ((qs.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (qs.getInt("ex") == 0))
{
qs.set("ex", ((getRandom(4) + 1) * 10));
qs.set("ex", (getRandom(4) + 1) * 10);
htmltext = event;
}
break;
@@ -210,7 +210,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
if ((qs.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (qs.getInt("ex") > 0))
{
takeItems(player, SILVER_ICE_CRYSTAL, 1);
final int val = (qs.getInt("ex") + 1);
final int val = qs.getInt("ex") + 1;
qs.set("ex", val);
playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY);
htmltext = event;
@@ -222,7 +222,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
if ((qs.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (qs.getInt("ex") > 0))
{
takeItems(player, SILVER_ICE_CRYSTAL, 1);
final int val = (qs.getInt("ex") + 2);
final int val = qs.getInt("ex") + 2;
qs.set("ex", val);
playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY);
htmltext = event;
@@ -257,7 +257,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
{
final int ex = qs.getInt("ex");
final int val1 = ex / 10;
final int val2 = ((ex - (val1 * 10)) + 2);
final int val2 = (ex - (val1 * 10)) + 2;
if (val1 == val2)
{
htmltext = "32023-07.html";
@@ -319,7 +319,7 @@ public final class Q00648_AnIceMerchantsDream extends Quest
}
else
{
htmltext = ((qs2 != null) && (qs2.isCompleted())) ? "32020-02.htm" : "32020-03.htm";
htmltext = ((qs2 != null) && qs2.isCompleted()) ? "32020-02.htm" : "32020-03.htm";
}
}
else if (qs.isStarted())

60
trunk/dist/game/data/scripts/quests/Q00655_AGrandPlanForTamingWildBeasts/Q00655_AGrandPlanForTamingWildBeasts.java vendored
View File

@@ -135,16 +135,13 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest
htmltext = "35627-04.html";
}
}
else if ((clan.getFortId() == ClanHallSiegeEngine.BEAST_FARM) && (minutesToSiege > 0) && (minutesToSiege < MINUTES_TO_SIEGE))
{
htmltext = HtmCache.getInstance().getHtm(talker.getHtmlPrefix(), PATH_TO_HTML);
}
else
{
if ((clan.getFortId() == ClanHallSiegeEngine.BEAST_FARM) && (minutesToSiege > 0) && (minutesToSiege < MINUTES_TO_SIEGE))
{
htmltext = HtmCache.getInstance().getHtm(talker.getHtmlPrefix(), PATH_TO_HTML);
}
else
{
htmltext = "35627-05.html";
}
htmltext = "35627-05.html";
}
}
else
@@ -153,36 +150,27 @@ public final class Q00655_AGrandPlanForTamingWildBeasts extends Quest
htmltext = htmltext.replace("%next_siege%", getSiegeDate());
}
}
else if ((minutesToSiege < 0) || (minutesToSiege > MINUTES_TO_SIEGE))
{
takeItems(talker, TRAINER_LICENSE, -1);
takeItems(talker, CRYSTAL_OF_PURITY, -1);
qs.exitQuest(true, true);
htmltext = "35627-07.html";
}
else if (hasQuestItems(talker, TRAINER_LICENSE))
{
htmltext = "35627-09.html";
}
else if (getQuestItemsCount(talker, CRYSTAL_OF_PURITY) < REQUIRED_CRYSTAL_COUNT)
{
htmltext = "35627-08.html";
}
else
{
if ((minutesToSiege < 0) || (minutesToSiege > MINUTES_TO_SIEGE))
{
takeItems(talker, TRAINER_LICENSE, -1);
takeItems(talker, CRYSTAL_OF_PURITY, -1);
qs.exitQuest(true, true);
htmltext = "35627-07.html";
}
else
{
if (hasQuestItems(talker, TRAINER_LICENSE))
{
htmltext = "35627-09.html";
}
else
{
if (getQuestItemsCount(talker, CRYSTAL_OF_PURITY) < REQUIRED_CRYSTAL_COUNT)
{
htmltext = "35627-08.html";
}
else
{
giveItems(talker, TRAINER_LICENSE, 1);
takeItems(talker, CRYSTAL_OF_PURITY, -1);
qs.setCond(3, true);
htmltext = "35627-10.html";
}
}
}
giveItems(talker, TRAINER_LICENSE, 1);
takeItems(talker, CRYSTAL_OF_PURITY, -1);
qs.setCond(3, true);
htmltext = "35627-10.html";
}
return htmltext;
}

4
trunk/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java vendored
View File

@@ -127,7 +127,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
return super.onKill(npc, player, isSummon);
}
final float chance = (DROP_RATE * Config.RATE_QUEST_DROP);
final float chance = DROP_RATE * Config.RATE_QUEST_DROP;
if (getRandom(1000) < chance)
{
rewardItems(partyMember, DINOSAUR_FANG_NECKLACE, 1);
@@ -155,7 +155,7 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
}
case State.STARTED:
{
htmltext = (hasQuestItems(player, DINOSAUR_FANG_NECKLACE)) ? "32105-05.html" : "32105-12.html";
htmltext = hasQuestItems(player, DINOSAUR_FANG_NECKLACE) ? "32105-05.html" : "32105-12.html";
break;
}
}

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

@@ -125,13 +125,10 @@ public class Q00699_GuardianOfTheSkies extends Quest
giveItems(killer, VULTURES_GOLDEN_FEATHER, amount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
else
else if (getRandom(1000) < MONSTERS.get(npc.getId()))
{
if (getRandom(1000) < MONSTERS.get(npc.getId()))
{
giveItems(killer, VULTURES_GOLDEN_FEATHER, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
giveItems(killer, VULTURES_GOLDEN_FEATHER, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
return super.onKill(npc, killer, isSummon);
@@ -149,7 +146,7 @@ public class Q00699_GuardianOfTheSkies extends Quest
case State.CREATED:
{
qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
htmltext = ((qs == null) || (!qs.isCompleted()) || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm";
htmltext = ((qs == null) || !qs.isCompleted() || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm";
break;
}
case State.STARTED:
@@ -157,7 +154,7 @@ public class Q00699_GuardianOfTheSkies extends Quest
final long feathers = getQuestItemsCount(player, VULTURES_GOLDEN_FEATHER);
if (feathers > 0)
{
giveAdena(player, ((feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0)), true);
giveAdena(player, (feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0), true);
takeItems(player, VULTURES_GOLDEN_FEATHER, -1);
htmltext = (feathers > BONUS_COUNT) ? "32557-07.html" : "32557-06.html";
}

4
trunk/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java vendored
View File

@@ -84,7 +84,7 @@ public class Q00700_CursedLife extends Quest
case "32560-02.htm":
{
qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
htmltext = ((player.getLevel() < MIN_LVL) || (qs == null) || (!qs.isCompleted())) ? "32560-03.htm" : event;
htmltext = ((player.getLevel() < MIN_LVL) || (qs == null) || !qs.isCompleted()) ? "32560-03.htm" : event;
break;
}
case "32560-04.htm":
@@ -132,7 +132,7 @@ public class Q00700_CursedLife extends Quest
final long sum = bones + ribs + skulls;
if (sum > 0)
{
giveAdena(player, ((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true);
giveAdena(player, (bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0), true);
takeItems(player, -1, SWALLOWED_BONES, SWALLOWED_STERNUM, SWALLOWED_SKULL);
htmltext = sum < 10 ? "32560-07.html" : "32560-08.html";
}

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

@@ -395,7 +395,7 @@ public class Q00702_ATrapForRevenge extends Quest
}
case State.STARTED:
{
htmltext = (qs.isCond(1)) ? "32563-05.html" : "32563-06.html";
htmltext = qs.isCond(1) ? "32563-05.html" : "32563-06.html";
break;
}
}

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

@@ -71,7 +71,7 @@ public final class Q00902_ReclaimOurEra extends Quest
private void giveItem(L2Npc npc, L2PcInstance player)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && (qs.isStarted()) && (!qs.isCond(5)) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isStarted() && !qs.isCond(5) && Util.checkIfInRange(1500, npc, player, false))
{
giveItems(player, MONSTER_DROPS.get(npc.getId()), 1);
qs.setCond(5, true);

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

@@ -92,19 +92,13 @@ public class Q00943_FillingTheEnergyOfDestruction extends Quest
}
case "33715-06.html":
{
takeItems(player, CORE_OF_TWISTED_MAGIC, 1);
giveItems(player, ENERGY_OF_DESTRUCTION, 1);
if (player.getLevel() >= 99)
{
takeItems(player, CORE_OF_TWISTED_MAGIC, 1);
giveItems(player, ENERGY_OF_DESTRUCTION, 1);
addExpAndSp(player, 0, 5371901);
qs.exitQuest(QuestType.DAILY, true);
}
else
{
takeItems(player, CORE_OF_TWISTED_MAGIC, 1);
giveItems(player, ENERGY_OF_DESTRUCTION, 1);
qs.exitQuest(QuestType.DAILY, true);
}
qs.exitQuest(QuestType.DAILY, true);
break;
}
}

6
trunk/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java vendored
View File

@@ -142,13 +142,13 @@ public class Q10274_CollectingInTheAir extends Quest
case State.CREATED:
{
qs = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName());
if (qs == null)
if (qs != null)
{
htmltext = "32557-00.html";
htmltext = ((player.getLevel() >= 75) && qs.isCompleted()) ? "32557-01.htm" : "32557-00.html";
}
else
{
htmltext = ((player.getLevel() >= 75) && qs.isCompleted()) ? "32557-01.htm" : "32557-00.html";
htmltext = "32557-00.html";
}
break;
}

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

@@ -215,7 +215,7 @@ public final class Q10284_AcquisitionOfDivineSword extends Quest
if (npc.getId() == RAFFORTY)
{
qs = player.getQuestState(Q10283_RequestOfIceMerchant.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-04.html";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32020-01.htm" : "32020-04.html";
}
break;
}

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

@@ -227,7 +227,7 @@ public final class Q10285_MeetingSirra extends Quest
if (npc.getId() == RAFFORTY)
{
qs = player.getQuestState(Q10284_AcquisitionOfDivineSword.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-04.htm";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32020-01.htm" : "32020-04.htm";
}
break;
}

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

@@ -177,7 +177,7 @@ public final class Q10286_ReunionWithSirra extends Quest
if (npc.getId() == RAFFORTY)
{
qs = player.getQuestState(Q10285_MeetingSirra.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-04.htm";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32020-01.htm" : "32020-04.htm";
}
break;
}

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

@@ -161,7 +161,7 @@ public final class Q10287_StoryOfThoseLeft extends Quest
if (npc.getId() == RAFFORTY)
{
qs = player.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32020-01.htm" : "32020-03.htm";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32020-01.htm" : "32020-03.htm";
}
break;
}

8
trunk/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java vendored
View File

@@ -215,7 +215,7 @@ public class Q10289_FadeToBlack extends Quest
for (L2PcInstance member : party.getMembers())
{
// only one lucky player will get the good item, the rest will get the bad one
rewardPlayer(getQuestState(member, false), (idx == rnd));
rewardPlayer(getQuestState(member, false), idx == rnd);
idx++;
}
}
@@ -231,7 +231,7 @@ public class Q10289_FadeToBlack extends Quest
@Override
public boolean checkPartyMember(QuestState qs, L2Npc npc)
{
return (qs.getCond() < 3);
return qs.getCond() < 3;
}
@Override
@@ -276,11 +276,11 @@ public class Q10289_FadeToBlack extends Quest
return htmltext;
}
private static final void rewardPlayer(QuestState qs, boolean isLucky)
private static void rewardPlayer(QuestState qs, boolean isLucky)
{
if ((qs != null) && qs.isCond(1))
{
giveItems(qs.getPlayer(), (isLucky ? MARK_OF_SPLENDOR : MARK_OF_DARKNESS), 1);
giveItems(qs.getPlayer(), isLucky ? MARK_OF_SPLENDOR : MARK_OF_DARKNESS, 1);
qs.setCond(isLucky ? 3 : 2, true);
}
}

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

@@ -139,7 +139,7 @@ public final class Q10290_LandDragonConqueror extends Quest
htmltext = "30755-07.html";
}
}
else if ((qs.isCond(2)) && hasQuestItems(player, MIRACLE_NECKLACE))
else if (qs.isCond(2) && hasQuestItems(player, MIRACLE_NECKLACE))
{
htmltext = "30755-08.html";
giveAdena(player, 131236, true);

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

@@ -240,7 +240,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
else if (qs.isCreated())
{
qs = player.getQuestState(Q00198_SevenSignsEmbryo.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32593-01.htm" : "32593-03.htm";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32593-01.htm" : "32593-03.htm";
}
else if (qs.isStarted())
{

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

@@ -231,7 +231,7 @@ public final class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends
else if (qs.isCreated())
{
qs = player.getQuestState(Q10292_SevenSignsGirlOfDoubt.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32784-01.htm" : "32784-11.htm";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32784-01.htm" : "32784-11.htm";
}
else if (qs.isStarted())
{

22
trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java vendored
View File

@@ -260,22 +260,22 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
}
case "DONE1":
{
htmltext = ((qs.getInt("good1") == 1) ? "32804-05.html" : "32804-03.html");
htmltext = (qs.getInt("good1") == 1) ? "32804-05.html" : "32804-03.html";
break;
}
case "DONE2":
{
htmltext = ((qs.getInt("good2") == 1) ? "32805-05.html" : "32805-03.html");
htmltext = (qs.getInt("good2") == 1) ? "32805-05.html" : "32805-03.html";
break;
}
case "DONE3":
{
htmltext = ((qs.getInt("good3") == 1) ? "32806-05.html" : "32806-03.html");
htmltext = (qs.getInt("good3") == 1) ? "32806-05.html" : "32806-03.html";
break;
}
case "DONE4":
{
htmltext = ((qs.getInt("good4") == 1) ? "32807-05.html" : "32807-03.html");
htmltext = (qs.getInt("good4") == 1) ? "32807-05.html" : "32807-03.html";
break;
}
case "SPAWN_MOBS":
@@ -312,7 +312,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
else if (qs.isCreated())
{
qs = player.getQuestState(Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom.class.getSimpleName());
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && (qs.isCompleted())) ? "32784-01.htm" : "32784-07.htm";
htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32784-01.htm" : "32784-07.htm";
}
else if (qs.isStarted() && qs.isCond(1))
{
@@ -336,7 +336,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
}
case 3:
{
htmltext = ((player.isSubClassActive()) ? "32792-09.html" : "32792-07.html");
htmltext = player.isSubClassActive() ? "32792-09.html" : "32792-07.html";
break;
}
}
@@ -403,22 +403,22 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
}
case READING_DESK1:
{
htmltext = ((qs.getInt("good1") == 1) ? "32821-03.html" : "32821-01.html");
htmltext = (qs.getInt("good1") == 1) ? "32821-03.html" : "32821-01.html";
break;
}
case READING_DESK5:
{
htmltext = ((qs.getInt("good2") == 1) ? "32821-03.html" : "32825-01.html");
htmltext = (qs.getInt("good2") == 1) ? "32821-03.html" : "32825-01.html";
break;
}
case READING_DESK9:
{
htmltext = ((qs.getInt("good3") == 1) ? "32821-03.html" : "32829-01.html");
htmltext = (qs.getInt("good3") == 1) ? "32821-03.html" : "32829-01.html";
break;
}
case READING_DESK13:
{
htmltext = ((qs.getInt("good4") == 1) ? "32821-03.html" : "32833-01.html");
htmltext = (qs.getInt("good4") == 1) ? "32821-03.html" : "32833-01.html";
break;
}
case SOLINAS_EVIL_THOUGHTS:
@@ -440,6 +440,6 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
private boolean hasCheckedAllRightBooks(QuestState qs)
{
return ((qs.getInt("good1") == 1) && (qs.getInt("good2") == 1) && (qs.getInt("good3") == 1) && (qs.getInt("good4") == 1));
return (qs.getInt("good1") == 1) && (qs.getInt("good2") == 1) && (qs.getInt("good3") == 1) && (qs.getInt("good4") == 1);
}
}

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

@@ -214,7 +214,7 @@ public final class Q10296_SevenSignsPowerOfTheSeal extends Quest
{
if (qs.isStarted())
{
if ((qs.isCond(2)) && (qs.getInt("boss") == 1))
if (qs.isCond(2) && (qs.getInt("boss") == 1))
{
qs.setCond(3, true);
htmltext = "32785-01.html";

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

@@ -362,7 +362,7 @@ public class Q10323_TrainLikeItsReal extends Quest
final QuestState qs = getQuestState(activeChar, false);
final Set<NpcLogListHolder> npcLogList = new HashSet<>(1);
if ((qs != null) && (qs.isCond(2)))
if ((qs != null) && qs.isCond(2))
{
npcLogList.add(new NpcLogListHolder(NpcStringId.ELIMINATE_THE_TRAINING_GOLEM, qs.getMemoState()));
return npcLogList;

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

@@ -43,7 +43,7 @@ public class Q10326_RespectYourElders extends Quest
// Misc
private static final int MAX_LEVEL = 20;
private static final Location HANDERMONKEY_SPAWN = new Location(-116617, 255497, -1432);
private final static Location[] HANDERMONKEY_LOC =
private static final Location[] HANDERMONKEY_LOC =
{
new Location(-116560, 255951, -1457),
new Location(-116688, 256597, -1472),

4
trunk/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java vendored
View File

@@ -53,7 +53,7 @@ public class Q10329_BackupSeekers extends Quest
private static final int MAX_LEVEL = 20;
private static final Location BART_SPAWN_1 = new Location(-117955, 255832, -1320);
private static final Location BART_SPAWN_2 = new Location(-114121, 252445, -1560);
private final static Location[] BART_LOC_1 =
private static final Location[] BART_LOC_1 =
{
new Location(-117063, 255528, -1296),
new Location(-115766, 254791, -1504),
@@ -61,7 +61,7 @@ public class Q10329_BackupSeekers extends Quest
new Location(-114606, 253534, -1528),
new Location(-114375, 252807, -1536),
};
private final static Location[] BART_LOC_2 =
private static final Location[] BART_LOC_2 =
{
new Location(-114410, 252220, -1591),
new Location(-114416, 250812, -1760),

42
trunk/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java vendored
View File

@@ -597,12 +597,9 @@ public class Q10331_StartOfFate extends Quest
{
htmltext = player.getLevel() >= MIN_LEVEL ? "32153-01.htm" : "32153-12.htm";
}
else
else if (player.getLevel() >= MIN_LEVEL)
{
if (player.getLevel() >= MIN_LEVEL)
{
htmltext = "32153-15.htm";
}
htmltext = "32153-15.htm";
}
break;
}
@@ -612,12 +609,9 @@ public class Q10331_StartOfFate extends Quest
{
htmltext = player.getLevel() >= MIN_LEVEL ? "32147-01.html" : "32147-11.html";
}
else
else if (player.getLevel() >= MIN_LEVEL)
{
if (player.getLevel() >= MIN_LEVEL)
{
htmltext = "32147-14.html";
}
htmltext = "32147-14.html";
}
break;
}
@@ -627,12 +621,9 @@ public class Q10331_StartOfFate extends Quest
{
htmltext = player.getLevel() >= MIN_LEVEL ? "32160-01.html" : "32160-11.html";
}
else
else if (player.getLevel() >= MIN_LEVEL)
{
if (player.getLevel() >= MIN_LEVEL)
{
htmltext = "32160-14.html";
}
htmltext = "32160-14.html";
}
break;
}
@@ -642,12 +633,9 @@ public class Q10331_StartOfFate extends Quest
{
htmltext = player.getLevel() >= MIN_LEVEL ? "32150-01.html" : "32150-10.html";
}
else
else if (player.getLevel() >= MIN_LEVEL)
{
if (player.getLevel() >= MIN_LEVEL)
{
htmltext = "32150-13.html";
}
htmltext = "32150-13.html";
}
break;
}
@@ -657,12 +645,9 @@ public class Q10331_StartOfFate extends Quest
{
htmltext = player.getLevel() >= MIN_LEVEL ? "32157-01.html" : "32157-08.html";
}
else
else if (player.getLevel() >= MIN_LEVEL)
{
if (player.getLevel() >= MIN_LEVEL)
{
htmltext = "32157-11.html";
}
htmltext = "32157-11.html";
}
break;
}
@@ -672,12 +657,9 @@ public class Q10331_StartOfFate extends Quest
{
htmltext = player.getLevel() >= MIN_LEVEL ? "32146-01.html" : "32146-09.html";
}
else
else if (player.getLevel() >= MIN_LEVEL)
{
if (player.getLevel() >= MIN_LEVEL)
{
htmltext = "32146-12.html";
}
htmltext = "32146-12.html";
}
break;
}

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

@@ -210,7 +210,7 @@ public class Q10335_RequestToFindSakum extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isStarted() && qs.isCond(2) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false)))
if ((qs != null) && qs.isStarted() && qs.isCond(2) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
{
int kills = qs.getInt(Integer.toString(npc.getId()));
if (kills < MOBS_REQUIRED.get(npc.getId())) // check if killed required number of monsters

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

@@ -158,7 +158,7 @@ public class Q10336_DividedSakumKanilov extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false); // kill counts independent on party/no party
if ((qs != null) && qs.isStarted() && qs.isCond(1) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false)))
if ((qs != null) && qs.isStarted() && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
{
qs.setCond(2);
}

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

@@ -202,7 +202,7 @@ public class Q10337_SakumsInfluence extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isStarted() && qs.isCond(2) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false)))
if ((qs != null) && qs.isStarted() && qs.isCond(2) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
{
int kills = 0;
switch (npc.getId())

6
trunk/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java vendored
View File

@@ -312,13 +312,13 @@ public class Q10341_DayOfDestinyHumansFate extends Quest
{
if (qs.isCond(2))
{
if (qs.get("" + npc.getId()) == null)
if (qs.get("" + npc.getId()) != null)
{
htmltext = "dead_soldier.html";
htmltext = "dead_collect.html";
}
else
{
htmltext = "dead_collect.html";
htmltext = "dead_soldier.html";
}
}
else if (qs.isCond(3))

6
trunk/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java vendored
View File

@@ -284,13 +284,13 @@ public class Q10342_DayOfDestinyElvenFate extends Quest
{
if (qs.isCond(2))
{
if (qs.get("" + npc.getId()) == null)
if (qs.get("" + npc.getId()) != null)
{
htmltext = "dead_soldier.html";
htmltext = "dead_collect.html";
}
else
{
htmltext = "dead_collect.html";
htmltext = "dead_soldier.html";
}
}
else if (qs.isCond(3))

6
trunk/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java vendored
View File

@@ -284,13 +284,13 @@ public class Q10343_DayOfDestinyDarkElfsFate extends Quest
{
if (qs.isCond(2))
{
if (qs.get("" + npc.getId()) == null)
if (qs.get("" + npc.getId()) != null)
{
htmltext = "dead_soldier.html";
htmltext = "dead_collect.html";
}
else
{
htmltext = "dead_collect.html";
htmltext = "dead_soldier.html";
}
}
else if (qs.isCond(3))

6
trunk/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java vendored
View File

@@ -263,13 +263,13 @@ public class Q10344_DayOfDestinyOrcsFate extends Quest
{
if (qs.isCond(2))
{
if (qs.get("" + npc.getId()) == null)
if (qs.get("" + npc.getId()) != null)
{
htmltext = "dead_soldier.html";
htmltext = "dead_collect.html";
}
else
{
htmltext = "dead_collect.html";
htmltext = "dead_soldier.html";
}
}
else if (qs.isCond(3))

6
trunk/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java vendored
View File

@@ -249,13 +249,13 @@ public class Q10345_DayOfDestinyDwarfsFate extends Quest
{
if (qs.isCond(2))
{
if (qs.get("" + npc.getId()) == null)
if (qs.get("" + npc.getId()) != null)
{
htmltext = "dead_soldier.html";
htmltext = "dead_collect.html";
}
else
{
htmltext = "dead_collect.html";
htmltext = "dead_soldier.html";
}
}
else if (qs.isCond(3))

6
trunk/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java vendored
View File

@@ -263,13 +263,13 @@ public class Q10346_DayOfDestinyKamaelsFate extends Quest
{
if (qs.isCond(2))
{
if (qs.get("" + npc.getId()) == null)
if (qs.get("" + npc.getId()) != null)
{
htmltext = "dead_soldier.html";
htmltext = "dead_collect.html";
}
else
{
htmltext = "dead_collect.html";
htmltext = "dead_soldier.html";
}
}
else if (qs.isCond(3))

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

@@ -178,7 +178,7 @@ public class Q10358_DividedSakumPoslof extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isStarted() && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false)))
if ((qs != null) && qs.isStarted() && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
{
int kills = 0;
switch (npc.getId())

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

@@ -247,7 +247,7 @@ public class Q10359_SakumsTrace extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isStarted() && qs.isCond(2) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false)))
if ((qs != null) && qs.isStarted() && qs.isCond(2) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
{
if (getQuestItemsCount(qs.getPlayer(), SUSPICIOUS_FRAGMENT) < SUSPICIOUS_FRAGMENT_REQUIRED)
{

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

@@ -808,7 +808,7 @@ public class Q10360_CertificationOfFate extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isStarted() && (qs.getCond() > 1) && (qs.getCond() < 7) && (Util.checkIfInRange(1500, npc, qs.getPlayer(), false)))
if ((qs != null) && qs.isStarted() && (qs.getCond() > 1) && (qs.getCond() < 7) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
{
switch (npc.getId())
{

Some files were not shown because too many files have changed in this diff Show More