From b30fc7481fbaa1f5d170c919e957eead13700bc9 Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Sun, 6 Jan 2013 16:13:27 +0000
Subject: [PATCH] BETA: Quest improvements and fixes.
---
.../Q00001_LettersOfLove.java | 2 +-
.../Q00011_SecretMeetingWithKetraOrcs.java | 7 +-
.../Q00012_SecretMeetingWithVarkaSilenos.java | 8 +-
.../Q00013_ParcelDelivery.java | 6 +-
.../Q00014_WhereaboutsOfTheArchaeologist.java | 16 +--
.../Q00015_SweetWhispers.java | 3 -
.../Q00016_TheComingDarkness.java | 8 +-
.../Q00017_LightAndDarkness.java | 15 +--
.../Q00018_MeetingWithTheGoldenRam.java | 15 +--
.../Q00019_GoToThePastureland.java | 7 +-
.../Q00020_BringUpWithLove.java | 40 +++----
...00024_InhabitantsOfTheForestOfTheDead.java | 3 -
.../Q00026_TiredOfWaiting.java | 3 +-
.../Q00027_ChestCaughtWithABaitOfWind.java | 19 ++-
.../Q00028_ChestCaughtWithABaitOfIcyAir.java | 14 +--
.../Q00029_ChestCaughtWithABaitOfEarth.java | 14 +--
.../Q00030_ChestCaughtWithABaitOfFire.java | 14 +--
.../Q00042_HelpTheUncle.java | 2 +-
.../Q00043_HelpTheSister.java | 2 +-
.../Q00044_HelpTheSon/Q00044_HelpTheSon.java | 2 +-
.../Q00050_LanoscosSpecialBait.java | 1 -
.../Q00051_OFullesSpecialBait.java | 1 -
.../Q00052_WilliesSpecialBait.java | 1 -
.../Q00053_LinnaeusSpecialBait.java | 1 -
.../Q00109_InSearchOfTheNest.java | 3 +-
.../Q00110_ToThePrimevalIsle.java | 6 +-
.../Q00113_StatusOfTheBeaconTower.java | 2 -
.../Q00114_ResurrectionOfAnOldManager.java | 9 +-
.../Q00119_LastImperialPrince.java | 1 -
.../Q00124_MeetingTheElroki.java | 11 +-
.../Q00125_TheNameOfEvil1.java | 13 +-
.../Q00126_TheNameOfEvil2.java | 21 ++--
.../Q00130_PathToHellbound.java | 2 +-
.../Q00132_MatrasCuriosity.java | 7 +-
.../Q00133_ThatsBloodyHot.java | 2 +-
.../Q00146_TheZeroHour.java | 6 +-
...Q00147_PathtoBecominganEliteMercenary.java | 25 ++--
...0148_PathtoBecominganExaltedMercenary.java | 23 ++--
.../Q00153_DeliverGoods.java | 6 +-
.../Q00179_IntoTheLargeCavern.java | 22 ++--
.../Q00182_NewRecruits.java | 20 ++--
.../Q00192_SevenSignsSeriesOfDoubt.java | 1 -
.../Q00193_SevenSignsDyingMessage.java | 1 -
.../Q00194_SevenSignsMammonsContract.java | 1 -
.../Q00197_SevenSignsTheSacredBookOfSeal.java | 2 -
.../Q00198_SevenSignsEmbryo.java | 2 -
.../Q00240_ImTheOnlyOneYouCanTrust.java | 14 +--
.../Q00241_PossessorOfAPreciousSoul1.java | 4 +-
.../Q00242_PossessorOfAPreciousSoul2.java | 2 +-
.../Q00247_PossessorOfAPreciousSoul4.java | 6 +-
.../Q00249_PoisonedPlainsOfTheLizardmen.java | 32 ++---
.../Q00250_WatchWhatYouEat.java | 10 +-
.../Q00251_NoSecrets/Q00251_NoSecrets.java | 13 +-
.../Q00252_ItSmellsDelicious.java | 33 ++---
.../Q00270_TheOneWhoEndsSilence.java | 12 +-
.../Q00278_HomeSecurity.java | 43 +++----
.../Q00279_TargetOfOpportunity.java | 3 +-
.../Q00287_FiguringItOut.java | 4 +-
.../Q00289_NoMoreSoupForYou.java | 32 ++---
.../Q00290_ThreatRemoval.java | 8 +-
.../Q00307_ControlDeviceOfTheGiants.java | 3 -
.../Q00309_ForAGoodCause.java | 3 +-
.../Q00310_OnlyWhatRemains.java | 3 -
.../Q00350_EnhanceYourWeapon.java | 13 +-
...00376_ExplorationOfTheGiantsCavePart1.java | 3 +-
...00377_ExplorationOfTheGiantsCavePart2.java | 5 +-
.../Q00401_PathToWarrior.java | 10 +-
.../Q00423_TakeYourBestShot.java | 72 ++++-------
.../Q00432_BirthdayPartySong.java | 4 -
.../Q00450_GraveRobberRescue.java | 12 +-
.../Q00451_LuciensAltar.java | 2 -
.../Q00452_FindingtheLostSoldiers.java | 1 -
.../Q00453_NotStrongEnoughAlone.java | 96 +++++++--------
.../Q00455_WingsOfSand.java | 2 +-
.../Q00457_LostAndFound.java | 2 +-
.../Q00461_RumbleInTheBase.java | 5 +-
.../Q00463_IMustBeaGenius.java | 3 -
.../quests/Q00464_Oath/Q00464_Oath.java | 2 -
...504_CompetitionfortheBanditStronghold.java | 9 +-
.../Q00508_AClansReputation.java | 1 -
.../Q00509_AClansFame/Q00509_AClansFame.java | 1 -
.../Q00510_AClansPrestige.java | 3 -
.../Q00511_AwlUnderFoot.java | 20 +---
.../Q00551_OlympiadStarter.java | 1 -
.../Q00552_OlympiadVeteran.java | 40 +++----
.../Q00553_OlympiadUndefeated.java | 13 +-
.../Q00601_WatchingEyes.java | 4 -
.../Q00602_ShadowOfLight.java | 3 -
.../Q00617_GatherTheFlames.java | 9 +-
.../Q00631_DeliciousTopChoiceMeat.java | 5 +-
.../Q00636_TruthBeyond.java | 3 +-
.../Q00637_ThroughOnceMore.java | 4 +-
.../Q00641_AttackSailren.java | 1 -
.../Q00642_APowerfulPrimevalCreature.java | 5 +-
.../Q00643_RiseAndFallOfTheElrokiTribe.java | 1 -
.../Q00651_RunawayYouth.java | 4 +-
.../Q00652_AnAgedExAdventurer.java | 1 -
.../Q00653_WildMaiden/Q00653_WildMaiden.java | 11 +-
.../Q00654_JourneyToASettlement.java | 1 -
.../Q00688_DefeatTheElrokianRaiders.java | 6 +-
.../Q00690_JudesRequest.java | 7 +-
.../Q00691_MatrasSuspiciousRequest.java | 13 +-
.../Q00692_HowtoOpposeEvil.java | 113 +++++++++---------
.../Q00702_ATrapForRevenge.java | 99 ++++++++-------
.../Q00901_HowLavasaurusesAreMade.java | 4 -
.../Q10267_JourneyToGracia.java | 2 +-
.../Q10268_ToTheSeedOfInfinity.java | 2 +-
.../Q10269_ToTheSeedOfDestruction.java | 2 +-
.../Q10272_LightFragment.java | 13 +-
.../Q10273_GoodDayToFly.java | 4 +-
.../Q10274_CollectingInTheAir.java | 2 +-
.../Q10275_ContainingTheAttributePower.java | 19 ++-
.../Q10279_MutatedKaneusOren.java | 8 +-
.../Q10281_MutatedKaneusRune.java | 2 +-
.../Q10282_ToTheSeedOfAnnihilation.java | 9 +-
.../Q10283_RequestOfIceMerchant.java | 55 ++++-----
.../Q10288_SecretMission.java | 8 +-
.../Q10289_FadeToBlack.java | 4 +-
.../Q10290_LandDragonConqueror.java | 8 +-
.../Q10291_FireDragonDestroyer.java | 6 +-
.../AirShipGludioGracia.java | 2 +-
121 files changed, 528 insertions(+), 847 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
index f8e403ea36..770a9f7497 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00001_LettersOfLove/Q00001_LettersOfLove.java
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.network.NpcStringId;
*/
public class Q00001_LettersOfLove extends Quest
{
- // NPC
+ // NPCs
private static final int DARIN = 30048;
private static final int ROXXY = 30006;
private static final int BAULRO = 30033;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
index 08ec9ef22e..cd5ffff754 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java
@@ -27,13 +27,11 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00011_SecretMeetingWithKetraOrcs extends Quest
{
-
// NPCs
private static final int CADMON = 31296;
private static final int LEON = 31256;
private static final int WAHKAN = 31371;
-
- // Items
+ // Item
private static final int BOX = 7231;
@Override
@@ -61,7 +59,6 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
case "31371-02.html":
if (st.isCond(2) && st.hasQuestItems(BOX))
{
- st.takeItems(BOX, -1);
st.addExpAndSp(233125, 18142);
st.exitQuest(false, true);
}
@@ -125,9 +122,9 @@ public class Q00011_SecretMeetingWithKetraOrcs extends Quest
public Q00011_SecretMeetingWithKetraOrcs(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(CADMON);
addTalkId(CADMON, LEON, WAHKAN);
+ registerQuestItems(BOX);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
index c59fbea4ee..00913b89ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java
@@ -27,13 +27,11 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
{
-
// NPCs
private static final int CADMON = 31296;
private static final int HELMUT = 31258;
private static final int NARAN = 31378;
-
- // Items
+ // Item
private static final int BOX = 7232;
@Override
@@ -61,7 +59,6 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
case "31378-02.html":
if (st.isCond(2) && st.hasQuestItems(BOX))
{
- st.takeItems(BOX, -1);
st.addExpAndSp(233125, 18142);
st.exitQuest(false, true);
}
@@ -125,10 +122,9 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
public Q00012_SecretMeetingWithVarkaSilenos(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(CADMON);
-
addTalkId(CADMON, HELMUT, NARAN);
+ registerQuestItems(BOX);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
index bf2d88c495..f7d05f88a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java
@@ -30,7 +30,7 @@ public class Q00013_ParcelDelivery extends Quest
// NPCs
private static final int FUNDIN = 31274;
private static final int VULCAN = 31539;
- // Items
+ // Item
private static final int PACKAGE = 7263;
@Override
@@ -52,8 +52,7 @@ public class Q00013_ParcelDelivery extends Quest
case "31539-01.html":
if (st.isCond(1) && st.hasQuestItems(PACKAGE))
{
- st.takeItems(PACKAGE, -1);
- st.giveItems(57, 157834);
+ st.giveAdena(157834, true);
st.addExpAndSp(589092, 58794);
st.exitQuest(false, true);
}
@@ -109,7 +108,6 @@ public class Q00013_ParcelDelivery extends Quest
public Q00013_ParcelDelivery(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(FUNDIN);
addTalkId(FUNDIN, VULCAN);
registerQuestItems(PACKAGE);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
index f29bbd3c50..2e34ceccf2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java
@@ -21,18 +21,16 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
/**
- * Where abouts Of The Archaeologist (14)<br>
+ * Whereabouts of the Archaeologist (14)<br>
* Original Jython script by disKret.
* @author nonom
*/
public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
{
-
// NPCs
private static final int LIESEL = 31263;
private static final int GHOST_OF_ADVENTURER = 31538;
-
- // Items
+ // Item
private static final int LETTER = 7253;
@Override
@@ -54,8 +52,7 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
case "31538-01.html":
if (st.isCond(1) && st.hasQuestItems(LETTER))
{
- st.takeItems(LETTER, -1);
- st.giveItems(57, 136928);
+ st.giveAdena(136928, true);
st.addExpAndSp(325881, 32524);
st.exitQuest(false, true);
}
@@ -111,14 +108,13 @@ public class Q00014_WhereaboutsOfTheArchaeologist extends Quest
public Q00014_WhereaboutsOfTheArchaeologist(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(LIESEL);
- addTalkId(LIESEL);
- addTalkId(GHOST_OF_ADVENTURER);
+ addTalkId(LIESEL, GHOST_OF_ADVENTURER);
+ registerQuestItems(LETTER);
}
public static void main(String[] args)
{
- new Q00014_WhereaboutsOfTheArchaeologist(14, Q00014_WhereaboutsOfTheArchaeologist.class.getSimpleName(), "Whereabouts Of The Archaeologist");
+ new Q00014_WhereaboutsOfTheArchaeologist(14, Q00014_WhereaboutsOfTheArchaeologist.class.getSimpleName(), "Whereabouts of the Archaeologist");
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
index 6a59f82720..5006136f9a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java
@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00015_SweetWhispers extends Quest
{
-
// NPCs
private static final int VLADIMIR = 31302;
private static final int HIERARCH = 31517;
@@ -122,9 +121,7 @@ public class Q00015_SweetWhispers extends Quest
public Q00015_SweetWhispers(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(VLADIMIR);
-
addTalkId(VLADIMIR, HIERARCH, M_NECROMANCER);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
index b3b1a431c7..51e949c33e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java
@@ -37,7 +37,7 @@ public class Q00016_TheComingDarkness extends Quest
private static final int EVIL_ALTAR_3 = 31514;
private static final int EVIL_ALTAR_4 = 31515;
private static final int EVIL_ALTAR_5 = 31516;
- // Items
+ // Item
private static final int CRYSTAL_OF_SEAL = 7167;
@Override
@@ -99,10 +99,9 @@ public class Q00016_TheComingDarkness extends Quest
break;
case State.STARTED:
final int npcId = npc.getNpcId();
- final int cond = st.getInt("cond");
if (npcId == HIERARCH)
{
- if (cond == 6)
+ if (st.isCond(6))
{
st.addExpAndSp(865187, 69172);
st.exitQuest(false, true);
@@ -113,7 +112,7 @@ public class Q00016_TheComingDarkness extends Quest
htmltext = "31517-02a.html";
}
}
- else if ((npcId - 31511) == cond)
+ else if ((npcId - 31511) == st.getCond())
{
htmltext = npcId + "-00.html";
}
@@ -129,7 +128,6 @@ public class Q00016_TheComingDarkness extends Quest
public Q00016_TheComingDarkness(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(HIERARCH);
addTalkId(HIERARCH, EVIL_ALTAR_1, EVIL_ALTAR_2, EVIL_ALTAR_3, EVIL_ALTAR_4, EVIL_ALTAR_5);
registerQuestItems(CRYSTAL_OF_SEAL);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
index fda727a4be..3d5ed4aa89 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java
@@ -29,15 +29,13 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00017_LightAndDarkness extends Quest
{
-
// NPCs
private static final int HIERARCH = 31517;
private static final int SAINT_ALTAR_1 = 31508;
private static final int SAINT_ALTAR_2 = 31509;
private static final int SAINT_ALTAR_3 = 31510;
private static final int SAINT_ALTAR_4 = 31511;
-
- // Items
+ // Item
private static final int BLOOD_OF_SAINT = 7168;
@Override
@@ -52,7 +50,6 @@ public class Q00017_LightAndDarkness extends Quest
switch (event)
{
-
case "31517-02.html":
if (player.getLevel() >= 61)
{
@@ -102,12 +99,11 @@ public class Q00017_LightAndDarkness extends Quest
break;
case State.STARTED:
final long blood = st.getQuestItemsCount(BLOOD_OF_SAINT);
- final int cond = st.getInt("cond");
final int npcId = npc.getNpcId();
switch (npcId)
{
case HIERARCH:
- if (cond < 5)
+ if (st.getCond() < 5)
{
htmltext = (blood >= 5) ? "31517-05.html" : "31517-04.html";
}
@@ -122,11 +118,11 @@ public class Q00017_LightAndDarkness extends Quest
case SAINT_ALTAR_2:
case SAINT_ALTAR_3:
case SAINT_ALTAR_4:
- if ((npcId - 31507) == cond)
+ if ((npcId - 31507) == st.getCond())
{
htmltext = npcId + ((blood > 0) ? "-00.html" : "-02.html");
}
- else if (cond > (npcId - 31507))
+ else if (st.getCond() > (npcId - 31507))
{
htmltext = npcId + "-03.html";
}
@@ -140,10 +136,9 @@ public class Q00017_LightAndDarkness extends Quest
public Q00017_LightAndDarkness(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(HIERARCH);
-
addTalkId(HIERARCH, SAINT_ALTAR_1, SAINT_ALTAR_2, SAINT_ALTAR_3, SAINT_ALTAR_4);
+ registerQuestItems(BLOOD_OF_SAINT);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
index 47f3de3fd4..2c5d5e55ba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java
@@ -27,13 +27,11 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00018_MeetingWithTheGoldenRam extends Quest
{
-
// NPCs
private static final int DONAL = 31314;
private static final int DAISY = 31315;
private static final int ABERCROMBIE = 31555;
-
- // Items
+ // Item
private static final int BOX = 7245;
@Override
@@ -59,16 +57,15 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
}
break;
case State.STARTED:
- final int cond = st.getInt("cond");
if (npcId == DONAL)
{
htmltext = "31314-04.html";
}
else if (npcId == DAISY)
{
- htmltext = (cond < 2) ? "31315-01.html" : "31315-03.html";
+ htmltext = (st.getCond() < 2) ? "31315-01.html" : "31315-03.html";
}
- else if ((npcId == ABERCROMBIE) && (cond == 2) && st.hasQuestItems(BOX))
+ else if ((npcId == ABERCROMBIE) && st.isCond(2) && st.hasQuestItems(BOX))
{
htmltext = "31555-01.html";
}
@@ -100,14 +97,13 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
}
break;
case "31315-02.html":
- st.set("cond", "2");
+ st.setCond(2, true);
st.giveItems(BOX, 1);
break;
case "31555-02.html":
if (st.hasQuestItems(BOX))
{
st.giveAdena(40000, true);
- st.takeItems(BOX, -1);
st.addExpAndSp(126668, 11731);
st.exitQuest(false, true);
}
@@ -119,10 +115,9 @@ public class Q00018_MeetingWithTheGoldenRam extends Quest
public Q00018_MeetingWithTheGoldenRam(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(DONAL);
-
addTalkId(DONAL, DAISY, ABERCROMBIE);
+ registerQuestItems(BOX);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
index 0b066dcf32..22b9a29d72 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java
@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00019_GoToThePastureland extends Quest
{
- // NPC
+ // NPCs
private static final int VLADIMIR = 31302;
private static final int TUNATUN = 31537;
// Items
@@ -54,7 +54,6 @@ public class Q00019_GoToThePastureland extends Quest
{
if (st.hasQuestItems(YOUNG_WILD_BEAST_MEAT))
{
- st.takeItems(YOUNG_WILD_BEAST_MEAT, -1);
st.giveAdena(50000, true);
st.addExpAndSp(136766, 12688);
st.exitQuest(false, true);
@@ -62,7 +61,6 @@ public class Q00019_GoToThePastureland extends Quest
}
else if (st.hasQuestItems(VEAL))
{
- st.takeItems(VEAL, -1);
st.giveAdena(147200, true);
st.addExpAndSp(385040, 75250);
st.exitQuest(false, true);
@@ -108,7 +106,7 @@ public class Q00019_GoToThePastureland extends Quest
break;
}
}
- else if ((npc.getNpcId() == TUNATUN) && (st.getInt("cond") == 1))
+ else if ((npc.getNpcId() == TUNATUN) && (st.isCond(1)))
{
htmltext = "31537-01.html";
}
@@ -118,7 +116,6 @@ public class Q00019_GoToThePastureland extends Quest
public Q00019_GoToThePastureland(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(VLADIMIR);
addTalkId(VLADIMIR, TUNATUN);
registerQuestItems(VEAL, YOUNG_WILD_BEAST_MEAT);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
index 6acc075645..cc7bfecea7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
@@ -27,13 +27,12 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00020_BringUpWithLove extends Quest
{
-
- // Npc
- private static final int _tunatun = 31537;
- // Item
- private static final int _beast_whip = 15473;
- private static final int _crystal = 9553;
- private static final int _jewel = 7185;
+ // NPC
+ private static final int TUNATUN = 31537;
+ // Items
+ private static final int BEAST_WHIP = 15473;
+ private static final int CRYSTAL = 9553;
+ private static final int JEWEL = 7185;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -46,7 +45,7 @@ public class Q00020_BringUpWithLove extends Quest
return htmltext;
}
- if (npc.getNpcId() == _tunatun)
+ if (npc.getNpcId() == TUNATUN)
{
if (event.equalsIgnoreCase("31537-12.htm"))
{
@@ -54,16 +53,16 @@ public class Q00020_BringUpWithLove extends Quest
}
else if (event.equalsIgnoreCase("31537-03.htm"))
{
- if (st.hasQuestItems(_beast_whip))
+ if (st.hasQuestItems(BEAST_WHIP))
{
return "31537-03a.htm";
}
- st.giveItems(_beast_whip, 1);
+ st.giveItems(BEAST_WHIP, 1);
}
else if (event.equalsIgnoreCase("31537-15.htm"))
{
- st.takeItems(_jewel, -1);
- st.giveItems(_crystal, 1);
+ st.takeItems(JEWEL, -1);
+ st.giveItems(CRYSTAL, 1);
st.exitQuest(false, true);
}
else if (event.equalsIgnoreCase("31537-21.html"))
@@ -72,11 +71,11 @@ public class Q00020_BringUpWithLove extends Quest
{
return "31537-23.html";
}
- if (st.hasQuestItems(_beast_whip))
+ if (st.hasQuestItems(BEAST_WHIP))
{
return "31537-22.html";
}
- st.giveItems(_beast_whip, 1);
+ st.giveItems(BEAST_WHIP, 1);
}
}
return htmltext;
@@ -92,7 +91,7 @@ public class Q00020_BringUpWithLove extends Quest
return htmltext;
}
- if (npc.getNpcId() == _tunatun)
+ if (npc.getNpcId() == TUNATUN)
{
switch (st.getState())
{
@@ -107,11 +106,11 @@ public class Q00020_BringUpWithLove extends Quest
}
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
htmltext = "31537-13.htm";
}
- else if (st.getInt("cond") == 2)
+ else if (st.isCond(2))
{
htmltext = "31537-14.htm";
}
@@ -135,10 +134,9 @@ public class Q00020_BringUpWithLove extends Quest
public Q00020_BringUpWithLove(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(_tunatun);
- addTalkId(_tunatun);
- addFirstTalkId(_tunatun);
+ addStartNpc(TUNATUN);
+ addTalkId(TUNATUN);
+ addFirstTalkId(TUNATUN);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
index 2a2540566f..e6f1af9449 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -31,7 +31,6 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
private static final int MYSTERIOUS_WIZARD = 31522;
private static final int TOMBSTONE = 31531;
private static final int LIDIA_MAID = 31532;
-
// Items
private static final int LIDIA_LETTER = 7065;
private static final int LIDIA_HAIRPIN = 7148;
@@ -40,7 +39,6 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
private static final int SILVER_CROSS_OF_EINHASAD = 7153;
private static final int BROKEN_SILVER_CROSS_OF_EINHASAD = 7154;
private static final int TOTEM = 7156;
-
// Monsters @formatter:off
private static final int[] MOBS = {21557, 21558, 21560, 21563, 21564, 21565, 21566, 21567};
// @formatter:on
@@ -340,7 +338,6 @@ public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
addStartNpc(DORIAN);
addTalkId(DORIAN, MYSTERIOUS_WIZARD, TOMBSTONE, LIDIA_MAID);
addKillId(MOBS);
-
registerQuestItems(LIDIA_LETTER, LIDIA_HAIRPIN, SUSPICIOUS_TOTEM_DOLL, FLOWER_BOUQUET, SILVER_CROSS_OF_EINHASAD, BROKEN_SILVER_CROSS_OF_EINHASAD);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
index 60384ab6ea..92537434ba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
@@ -99,7 +99,7 @@ public class Q00026_TiredOfWaiting extends Quest
}
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
switch (npcId)
{
@@ -125,7 +125,6 @@ public class Q00026_TiredOfWaiting extends Quest
public Q00026_TiredOfWaiting(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(ISAEL_SILVERSHADOW);
addTalkId(ISAEL_SILVERSHADOW, KITZKA);
registerQuestItems(DELIVERY_BOX);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
index d05d21b7e8..093c515484 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
@@ -29,11 +29,9 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00027_ChestCaughtWithABaitOfWind extends Quest
{
-
// NPCs
private static final int LANOSCO = 31570;
private static final int SHALING = 31434;
-
// Items
private static final int BLUE_TREASURE_BOX = 6500;
private static final int STRANGE_BLUESPRINT = 7625;
@@ -55,7 +53,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
st.startQuest();
break;
case "31570-05.htm":
- if ((st.getInt("cond") == 1) && (st.hasQuestItems(BLUE_TREASURE_BOX)))
+ if (st.isCond(1) && st.hasQuestItems(BLUE_TREASURE_BOX))
{
htmltext = "31570-06.htm";
st.setCond(2, true);
@@ -64,10 +62,9 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
}
break;
case "31434-02.htm":
- if ((st.getInt("cond") == 2) && (st.hasQuestItems(STRANGE_BLUESPRINT)))
+ if (st.isCond(2) && st.hasQuestItems(STRANGE_BLUESPRINT))
{
st.giveItems(BLACK_PEARL_RING, 1);
- st.takeItems(STRANGE_BLUESPRINT, -1);
st.exitQuest(false, true);
htmltext = "31434-01.htm";
}
@@ -87,7 +84,6 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
return htmltext;
}
- final int npcId = npc.getNpcId();
switch (st.getState())
{
case State.COMPLETED:
@@ -95,7 +91,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
break;
case State.CREATED:
final QuestState qs = player.getQuestState(Q00050_LanoscosSpecialBait.class.getSimpleName());
- if (npcId == LANOSCO)
+ if (npc.getNpcId() == LANOSCO)
{
htmltext = "31570-02.htm";
if (qs != null)
@@ -105,11 +101,10 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
}
break;
case State.STARTED:
- final int cond = st.getInt("cond");
- switch (npcId)
+ switch (npc.getNpcId())
{
case LANOSCO:
- if (cond == 1)
+ if (st.isCond(1))
{
if (st.hasQuestItems(BLUE_TREASURE_BOX))
{
@@ -126,7 +121,7 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
}
break;
case SHALING:
- if (cond == 2)
+ if (st.isCond(2))
{
htmltext = "31434-00.htm";
}
@@ -139,9 +134,9 @@ public class Q00027_ChestCaughtWithABaitOfWind extends Quest
public Q00027_ChestCaughtWithABaitOfWind(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(LANOSCO);
addTalkId(LANOSCO, SHALING);
+ registerQuestItems(STRANGE_BLUESPRINT);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
index 132074a647..989f855fc7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java
@@ -29,11 +29,9 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
{
-
// NPCs
private static final int OFULLE = 31572;
private static final int KIKI = 31442;
-
// Items
private static final int YELLOW_TREASURE_BOX = 6503;
private static final int KIKIS_LETTER = 7626;
@@ -55,7 +53,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
st.startQuest();
break;
case "31572-08.htm":
- if ((st.getInt("cond") == 1) && (st.hasQuestItems(YELLOW_TREASURE_BOX)))
+ if (st.isCond(1) && st.hasQuestItems(YELLOW_TREASURE_BOX))
{
st.giveItems(KIKIS_LETTER, 1);
st.takeItems(YELLOW_TREASURE_BOX, -1);
@@ -64,10 +62,9 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
}
break;
case "31442-03.htm":
- if ((st.getInt("cond") == 2) && (st.hasQuestItems(KIKIS_LETTER)))
+ if (st.isCond(2) && st.hasQuestItems(KIKIS_LETTER))
{
st.giveItems(ELVEN_RING, 1);
- st.takeItems(KIKIS_LETTER, -1);
st.exitQuest(false, true);
htmltext = "31442-02.htm";
}
@@ -105,11 +102,10 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
}
break;
case State.STARTED:
- final int cond = st.getInt("cond");
switch (npcId)
{
case OFULLE:
- switch (cond)
+ switch (st.getCond())
{
case 1:
htmltext = "31572-06.htm";
@@ -124,7 +120,7 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
}
break;
case KIKI:
- if (cond == 2)
+ if (st.isCond(2))
{
htmltext = "31442-01.htm";
}
@@ -138,9 +134,9 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir extends Quest
public Q00028_ChestCaughtWithABaitOfIcyAir(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(OFULLE);
addTalkId(OFULLE, KIKI);
+ registerQuestItems(KIKIS_LETTER);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
index a67da2d53a..94ae8a7d98 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java
@@ -29,11 +29,9 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
{
-
// NPCs
private static final int WILLIE = 31574;
private static final int ANABEL = 30909;
-
// Items
private static final int PURPLE_TREASURE_BOX = 6507;
private static final int SMALL_GLASS_BOX = 7627;
@@ -55,7 +53,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
st.startQuest();
break;
case "31574-08.htm":
- if ((st.getInt("cond") == 1) && (st.hasQuestItems(PURPLE_TREASURE_BOX)))
+ if (st.isCond(1) && st.hasQuestItems(PURPLE_TREASURE_BOX))
{
st.giveItems(SMALL_GLASS_BOX, 1);
st.takeItems(PURPLE_TREASURE_BOX, -1);
@@ -64,10 +62,9 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
}
break;
case "30909-03.htm":
- if ((st.getInt("cond") == 2) && (st.hasQuestItems(SMALL_GLASS_BOX)))
+ if (st.isCond(2) && st.hasQuestItems(SMALL_GLASS_BOX))
{
st.giveItems(PLATED_LEATHER_GLOVES, 1);
- st.takeItems(SMALL_GLASS_BOX, -1);
st.exitQuest(false, true);
htmltext = "30909-02.htm";
}
@@ -105,11 +102,10 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
}
break;
case State.STARTED:
- final int cond = st.getInt("cond");
switch (npcId)
{
case WILLIE:
- switch (cond)
+ switch (st.getCond())
{
case 1:
htmltext = "31574-06.htm";
@@ -124,7 +120,7 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
}
break;
case ANABEL:
- if (cond == 2)
+ if (st.isCond(2))
{
htmltext = "30909-01.htm";
}
@@ -138,9 +134,9 @@ public class Q00029_ChestCaughtWithABaitOfEarth extends Quest
public Q00029_ChestCaughtWithABaitOfEarth(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(WILLIE);
addTalkId(WILLIE, ANABEL);
+ registerQuestItems(SMALL_GLASS_BOX);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
index afcf9f0435..8b37dee8ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java
@@ -29,11 +29,9 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00030_ChestCaughtWithABaitOfFire extends Quest
{
-
// NPCs
private static final int LINNAEUS = 31577;
private static final int RUKAL = 30629;
-
// Items
private static final int RED_TREASURE_BOX = 6511;
private static final int RUKAL_MUSICAL = 7628;
@@ -55,7 +53,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
st.startQuest();
break;
case "31577-04a.htm":
- if ((st.getInt("cond") == 1) && (st.hasQuestItems(RED_TREASURE_BOX)))
+ if (st.isCond(1) && st.hasQuestItems(RED_TREASURE_BOX))
{
st.giveItems(RUKAL_MUSICAL, 1);
st.takeItems(RED_TREASURE_BOX, -1);
@@ -64,10 +62,9 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
}
break;
case "30629-02.htm":
- if ((st.getInt("cond") == 2) && (st.hasQuestItems(RUKAL_MUSICAL)))
+ if (st.isCond(2) && st.hasQuestItems(RUKAL_MUSICAL))
{
st.giveItems(PROTECTION_NECKLACE, 1);
- st.takeItems(RUKAL_MUSICAL, -1);
st.exitQuest(false, true);
htmltext = "30629-03.htm";
}
@@ -106,11 +103,10 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
}
break;
case State.STARTED:
- final int cond = st.getInt("cond");
switch (npcId)
{
case LINNAEUS:
- switch (cond)
+ switch (st.getCond())
{
case 1:
htmltext = "31577-03a.htm";
@@ -125,7 +121,7 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
}
break;
case RUKAL:
- if (cond == 2)
+ if (st.isCond(2))
{
htmltext = "30629-01.htm";
}
@@ -139,9 +135,9 @@ public class Q00030_ChestCaughtWithABaitOfFire extends Quest
public Q00030_ChestCaughtWithABaitOfFire(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(LINNAEUS);
addTalkId(LINNAEUS, RUKAL);
+ registerQuestItems(RUKAL_MUSICAL);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
index a5383ead17..86604de3fb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -30,7 +30,7 @@ public class Q00042_HelpTheUncle extends Quest
// NPCs
private static final int WATERS = 30828;
private static final int SOPHYA = 30735;
- // Monster
+ // Monsters
private static final int MONSTER_EYE_DESTROYER = 20068;
private static final int MONSTER_EYE_GAZER = 20266;
// Items
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
index 4354a09d07..d2feb24265 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -30,7 +30,7 @@ public class Q00043_HelpTheSister extends Quest
// NPCs
private static final int COOPER = 30829;
private static final int GALLADUCCI = 30097;
- // Monster
+ // Monsters
private static final int SPECTER = 20171;
private static final int SORROW_MAIDEN = 20197;
// Items
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
index d05ad8d4d7..b0f3a7012d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -30,7 +30,7 @@ public class Q00044_HelpTheSon extends Quest
// NPCs
private static final int LUNDY = 30827;
private static final int DRIKUS = 30505;
- // Monster
+ // Monsters
private static final int MAILLE_GUARD = 20921;
private static final int MAILLE_SCOUT = 20920;
private static final int MAILLE_LIZARDMAN = 20919;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
index 60595099b5..abb3a1cd67 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java
@@ -121,7 +121,6 @@ public class Q00050_LanoscosSpecialBait extends Quest
public Q00050_LanoscosSpecialBait(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(LANOSCO);
addTalkId(LANOSCO);
addKillId(SINGING_WIND);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
index fb01acb067..8a81c7e5b7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java
@@ -121,7 +121,6 @@ public class Q00051_OFullesSpecialBait extends Quest
public Q00051_OFullesSpecialBait(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(OFULLE);
addTalkId(OFULLE);
addKillId(FETTERED_SOUL);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
index 97535b74a5..ade6cb02dc 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java
@@ -117,7 +117,6 @@ public class Q00052_WilliesSpecialBait extends Quest
public Q00052_WilliesSpecialBait(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(WILLIE);
addTalkId(WILLIE);
addKillId(TARLK_BASILISK);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
index d025acc560..783d7e62a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
@@ -146,7 +146,6 @@ public class Q00053_LinnaeusSpecialBait extends Quest
public Q00053_LinnaeusSpecialBait(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(LINNAEUS);
addTalkId(LINNAEUS);
addKillId(CRIMSON_DRAKE);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
index 1c9e26ca05..c5e224a8f6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00109_InSearchOfTheNest extends Quest
{
- // NPC
+ // NPCs
private static final int PIERCE = 31553;
private static final int SCOUTS_CORPSE = 32015;
private static final int KAHMAN = 31554;
@@ -127,7 +127,6 @@ public class Q00109_InSearchOfTheNest extends Quest
public Q00109_InSearchOfTheNest(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(PIERCE);
addTalkId(PIERCE, SCOUTS_CORPSE, KAHMAN);
registerQuestItems(SCOUTS_NOTE);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
index 44b8f0f71c..a19609094f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java
@@ -26,10 +26,10 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00110_ToThePrimevalIsle extends Quest
{
- // NPC
+ // NPCs
private static final int ANTON = 31338;
private static final int MARQUEZ = 32113;
- // Items
+ // Item
private static final int ANCIENT_BOOK = 8777;
@Override
@@ -49,7 +49,6 @@ public class Q00110_ToThePrimevalIsle extends Quest
break;
case "32113-2.html":
case "32113-2a.html":
- st.takeItems(ANCIENT_BOOK, -1);
st.giveAdena(191678, true);
st.addExpAndSp(251602, 25245);
st.exitQuest(false, true);
@@ -97,7 +96,6 @@ public class Q00110_ToThePrimevalIsle extends Quest
public Q00110_ToThePrimevalIsle(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(ANTON);
addTalkId(ANTON, MARQUEZ);
registerQuestItems(ANCIENT_BOOK);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
index 740b8a1770..ab79d80e84 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java
@@ -30,7 +30,6 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
// NPCs
private static final int MOIRA = 31979;
private static final int TORRANT = 32016;
-
// Items
private static final int FLAME_BOX = 14860;
private static final int FIRE_BOX = 8086;
@@ -114,7 +113,6 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
super(questId, name, descr);
addStartNpc(MOIRA);
addTalkId(MOIRA, TORRANT);
-
registerQuestItems(FIRE_BOX, FLAME_BOX);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
index 09b1919c7a..1c52a1f681 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java
@@ -21,6 +21,7 @@ import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.itemcontainer.PcInventory;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
@@ -48,7 +49,6 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
private static final int STARSTONE2 = 8289;
private static final int DETCTOR = 8090;
private static final int DETCTOR2 = 8091;
- private static final int ADENA = 57;
// Monster
private static final int GUARDIAN = 27318;
// Zones
@@ -224,10 +224,10 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
st.setCond(15, true);
break;
case "32047-29c.html":
- if (st.getQuestItemsCount(ADENA) >= 3000)
+ if (player.getAdena() >= 3000)
{
st.giveItems(STARSTONE2, 1);
- st.takeItems(ADENA, 3000);
+ st.takeItems(PcInventory.ADENA_ID, 3000);
st.unset("talk");
st.setCond(26, true);
}
@@ -575,7 +575,7 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
{
if (character.isPlayer())
{
- final QuestState st = ((L2PcInstance) character).getQuestState(getName());
+ final QuestState st = character.getActingPlayer().getQuestState(getName());
if ((st != null) && st.isCond(17))
{
st.takeItems(DETCTOR, 1);
@@ -594,7 +594,6 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
addTalkId(YUMI, WENDY, BOX, STONES, NEWYEAR);
addKillId(GUARDIAN);
addEnterZoneId(ZONES);
-
registerQuestItems(STARSTONE, STARSTONE2, DETCTOR, DETCTOR2, LETTER);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
index 3238b5e06a..95ca09db45 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java
@@ -37,7 +37,6 @@ public class Q00119_LastImperialPrince extends Quest
public Q00119_LastImperialPrince(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(NAMELESS_SPIRIT);
addTalkId(NAMELESS_SPIRIT, DEVORIN);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
index 192e2ac75d..d0394da8f1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
@@ -26,13 +26,13 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00124_MeetingTheElroki extends Quest
{
- // NPC
+ // NPCs
private static final int MARQUEZ = 32113;
private static final int MUSHIKA = 32114;
private static final int ASAMAH = 32115;
private static final int KARAKAWEI = 32117;
private static final int MANTARASA = 32118;
- // Items
+ // Item
private static final int MANTARASA_EGG = 8778;
@Override
@@ -144,7 +144,7 @@ public class Q00124_MeetingTheElroki extends Quest
case ASAMAH:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -174,7 +174,7 @@ public class Q00124_MeetingTheElroki extends Quest
case KARAKAWEI:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -196,7 +196,7 @@ public class Q00124_MeetingTheElroki extends Quest
case MANTARASA:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -220,7 +220,6 @@ public class Q00124_MeetingTheElroki extends Quest
public Q00124_MeetingTheElroki(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(MARQUEZ);
addTalkId(MARQUEZ, MUSHIKA, ASAMAH, KARAKAWEI, MANTARASA);
registerQuestItems(MANTARASA_EGG);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
index 4437738c8a..09037f643c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
*/
public class Q00125_TheNameOfEvil1 extends Quest
{
- // NPC
+ // NPCs
private static final int MUSHIKA = 32114;
private static final int KARAKAWEI = 32117;
private static final int ULU_KAIMU = 32119;
@@ -257,7 +257,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
}
break;
case State.STARTED:
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
htmltext = "32114-09.html";
@@ -290,7 +290,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
case KARAKAWEI:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
htmltext = "32117-01.html";
@@ -325,7 +325,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
case ULU_KAIMU:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -360,7 +360,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
case BALU_KAIMU:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -396,7 +396,7 @@ public class Q00125_TheNameOfEvil1 extends Quest
case CHUTA_KAIMU:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -484,7 +484,6 @@ public class Q00125_TheNameOfEvil1 extends Quest
public Q00125_TheNameOfEvil1(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(MUSHIKA);
addTalkId(MUSHIKA, KARAKAWEI, ULU_KAIMU, BALU_KAIMU, CHUTA_KAIMU);
addKillId(ORNITHOMIMUS.keySet());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
index bc9b0bee31..4bba624cf6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java
@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
*/
public class Q00126_TheNameOfEvil2 extends Quest
{
- // NPC
+ // NPCs
private static final int SHILENS_STONE_STATUE = 32109;
private static final int MUSHIKA = 32114;
private static final int ASAMAH = 32115;
@@ -317,7 +317,6 @@ public class Q00126_TheNameOfEvil2 extends Quest
st.exitQuest(false, true);
break;
}
-
return event;
}
@@ -348,7 +347,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
}
break;
case State.STARTED:
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
htmltext = "32115-1d.html";
@@ -394,7 +393,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
case ULU_KAIMU:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
htmltext = "32119-1.html";
@@ -418,7 +417,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
case BALU_KAIMU:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -445,7 +444,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
case CHUTA_KAIMU:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -475,7 +474,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
case WARRIORS_GRAVE:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -538,7 +537,7 @@ public class Q00126_TheNameOfEvil2 extends Quest
case SHILENS_STONE_STATUE:
if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -580,12 +579,11 @@ public class Q00126_TheNameOfEvil2 extends Quest
case MUSHIKA:
if (st.isStarted())
{
- int cond = st.getInt("cond");
- if (cond < 22)
+ if (st.getCond() < 22)
{
htmltext = "32114-4.html";
}
- else if (cond == 22)
+ else if (st.isCond(22))
{
htmltext = "32114-1.html";
}
@@ -602,7 +600,6 @@ public class Q00126_TheNameOfEvil2 extends Quest
public Q00126_TheNameOfEvil2(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(ASAMAH);
addTalkId(ASAMAH, ULU_KAIMU, BALU_KAIMU, CHUTA_KAIMU, WARRIORS_GRAVE, SHILENS_STONE_STATUE, MUSHIKA);
registerQuestItems(GAZKH_FRAGMENT, BONE_POWDER);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
index 3be4499b58..8dd11b39bf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java
@@ -30,7 +30,7 @@ public class Q00130_PathToHellbound extends Quest
// NPCs
private static final int CASIAN = 30612;
private static final int GALATE = 32292;
- // Items
+ // Item
private static final int CASIANS_BLUE_CRYSTAL = 12823;
// Misc
private static final int MIN_LEVEL = 78;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
index 8453732f99..3001d5759b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java
@@ -63,7 +63,7 @@ public final class Q00132_MatrasCuriosity extends Quest
htmltext = "32245-03a.htm";
}
}
- else if (event.equalsIgnoreCase("32245-07.htm") && (st.getInt("cond") == 3) && !st.isCompleted())
+ else if (event.equalsIgnoreCase("32245-07.htm") && st.isCond(3) && !st.isCompleted())
{
st.giveAdena(65884, true);
st.addExpAndSp(50541, 5094);
@@ -98,7 +98,7 @@ public final class Q00132_MatrasCuriosity extends Quest
}
else if (st.isStarted())
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
case 2:
@@ -171,11 +171,10 @@ public final class Q00132_MatrasCuriosity extends Quest
public Q00132_MatrasCuriosity(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(MATRAS);
addTalkId(MATRAS);
-
addKillId(RANKU, DEMON_PRINCE);
+ registerQuestItems(BLUEPRINT_RANKU, BLUEPRINT_PRINCE);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
index a2551f52db..4c7a6400c3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java
@@ -32,7 +32,7 @@ public class Q00133_ThatsBloodyHot extends Quest
// NPCs
private static final int KANIS = 32264;
private static final int GALATE = 32292;
- // Items
+ // Item
private static final int REFINED_CRYSTAL_SAMPLE = 9785;
// Misc
private static final int MIN_LEVEL = 78;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
index b73ce113a3..18a5ec2268 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java
@@ -28,10 +28,11 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00146_TheZeroHour extends Quest
{
- // NPC
+ // NPCs
private static final int KAHMAN = 31554;
private static final int QUEEN_SHYEED = 25671;
// Item
+ private static final int KAHMANS_SUPPLY_BOX = 14849;
private static final int FANG = 14859;
@Override
@@ -87,9 +88,8 @@ public class Q00146_TheZeroHour extends Quest
}
else
{
- st.giveItems(14849, 1);
+ st.giveItems(KAHMANS_SUPPLY_BOX, 1);
st.addExpAndSp(154616, 12500);
- st.takeItems(FANG, 1);
st.exitQuest(false, true);
htmltext = "31554-05.html";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
index af9c855774..d8789b2e7e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java
@@ -27,9 +27,8 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00147_PathtoBecominganEliteMercenary extends Quest
{
-
// NPCs
- private static final int[] _merc =
+ private static final int[] MERC =
{
36481,
36482,
@@ -42,8 +41,8 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
36489
};
// Items
- private static final int _cert_ordinary = 13766;
- private static final int _cert_elite = 13767;
+ private static final int ORDINARY_CERTIFICATE = 13766;
+ private static final int ELITE_CERTIFICATE = 13767;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -58,11 +57,11 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
if (event.equalsIgnoreCase("elite-02.htm"))
{
- if (st.hasQuestItems(_cert_ordinary))
+ if (st.hasQuestItems(ORDINARY_CERTIFICATE))
{
return "elite-02a.htm";
}
- st.giveItems(_cert_ordinary, 1);
+ st.giveItems(ORDINARY_CERTIFICATE, 1);
}
else if (event.equalsIgnoreCase("elite-04.htm"))
{
@@ -94,15 +93,14 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
}
break;
case State.STARTED:
- final int cond = st.getInt("cond");
- if (cond < 4)
+ if (st.getCond() < 4)
{
htmltext = "elite-05.htm";
}
- else if (cond == 4)
+ else if (st.isCond(4))
{
- st.takeItems(_cert_ordinary, -1);
- st.giveItems(_cert_elite, 1);
+ st.takeItems(ORDINARY_CERTIFICATE, -1);
+ st.giveItems(ELITE_CERTIFICATE, 1);
st.exitQuest(false);
htmltext = "elite-06.htm";
}
@@ -117,9 +115,8 @@ public class Q00147_PathtoBecominganEliteMercenary extends Quest
public Q00147_PathtoBecominganEliteMercenary(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(_merc);
- addTalkId(_merc);
+ addStartNpc(MERC);
+ addTalkId(MERC);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
index ad80acf76d..1faa0c4290 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.quest.State;
public class Q00148_PathtoBecominganExaltedMercenary extends Quest
{
// NPCs
- private static final int[] _merc =
+ private static final int[] MERC =
{
36481,
36482,
@@ -43,8 +43,8 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
36489
};
// Items
- private static final int _cert_elite = 13767;
- private static final int _cert_top_elite = 13768;
+ private static final int ELITE_CERTIFICATE = 13767;
+ private static final int TOP_ELITE_CERTIFICATE = 13768;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -58,7 +58,7 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
if (event.equalsIgnoreCase("exalted-00b.htm"))
{
- st.giveItems(_cert_elite, 1);
+ st.giveItems(ELITE_CERTIFICATE, 1);
}
else if (event.equalsIgnoreCase("exalted-03.htm"))
{
@@ -85,7 +85,7 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
{
htmltext = "castle.htm";
}
- else if (st.hasQuestItems(_cert_elite))
+ else if (st.hasQuestItems(ELITE_CERTIFICATE))
{
htmltext = "exalted-01.htm";
}
@@ -102,14 +102,14 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
}
break;
case State.STARTED:
- if (st.getInt("cond") < 4)
+ if (st.getCond() < 4)
{
htmltext = "exalted-04.htm";
}
- else if (st.getInt("cond") == 4)
+ else if (st.isCond(4))
{
- st.takeItems(_cert_elite, -1);
- st.giveItems(_cert_top_elite, 1);
+ st.takeItems(ELITE_CERTIFICATE, -1);
+ st.giveItems(TOP_ELITE_CERTIFICATE, 1);
st.exitQuest(false);
htmltext = "exalted-05.htm";
}
@@ -124,9 +124,8 @@ public class Q00148_PathtoBecominganExaltedMercenary extends Quest
public Q00148_PathtoBecominganExaltedMercenary(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(_merc);
- addTalkId(_merc);
+ addStartNpc(MERC);
+ addTalkId(MERC);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
index fa795723ca..7d940295ef 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java
@@ -32,7 +32,7 @@ public class Q00153_DeliverGoods extends Quest
private static final int SILVIA_ID = 30003;
private static final int ARNOLD_ID = 30041;
private static final int RANT_ID = 30054;
- // ITEMs
+ // Items
private static final int DELIVERY_LIST_ID = 1012;
private static final int HEAVY_WOOD_BOX_ID = 1013;
private static final int CLOTH_BUNDLE_ID = 1014;
@@ -40,8 +40,7 @@ public class Q00153_DeliverGoods extends Quest
private static final int JACKSONS_RECEIPT_ID = 1016;
private static final int SILVIAS_RECEIPT_ID = 1017;
private static final int RANTS_RECEIPT_ID = 1018;
-
- // REWARDs
+ // Rewards
private static final int SOULSHOT_NO_GRADE_ID = 1835; // You get 3 Soulshots no grade.
private static final int RING_OF_KNOWLEDGE_ID = 875;
private static final int XP_REWARD_AMOUNT = 600;
@@ -49,7 +48,6 @@ public class Q00153_DeliverGoods extends Quest
public Q00153_DeliverGoods(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(ARNOLD_ID, JACKSON_ID, SILVIA_ID, ARNOLD_ID, RANT_ID);
registerQuestItems(DELIVERY_LIST_ID, HEAVY_WOOD_BOX_ID, CLOTH_BUNDLE_ID, CLAY_POT_ID, JACKSONS_RECEIPT_ID, SILVIAS_RECEIPT_ID, RANTS_RECEIPT_ID);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
index 39c46e362b..c97fc99a46 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java
@@ -28,10 +28,9 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00179_IntoTheLargeCavern extends Quest
{
-
- // NPC's
- private static final int _kekropus = 32138;
- private static final int _nornil = 32258;
+ // NPCs
+ private static final int KEKROPUS = 32138;
+ private static final int MENACING_MACHINE = 32258;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -43,14 +42,14 @@ public class Q00179_IntoTheLargeCavern extends Quest
return htmltext;
}
- if (npc.getNpcId() == _kekropus)
+ if (npc.getNpcId() == KEKROPUS)
{
if (event.equalsIgnoreCase("32138-03.html"))
{
st.startQuest();
}
}
- else if (npc.getNpcId() == _nornil)
+ else if (npc.getNpcId() == MENACING_MACHINE)
{
if (event.equalsIgnoreCase("32258-08.html"))
{
@@ -79,7 +78,7 @@ public class Q00179_IntoTheLargeCavern extends Quest
return htmltext;
}
- if (npc.getNpcId() == _kekropus)
+ if (npc.getNpcId() == KEKROPUS)
{
switch (st.getState())
{
@@ -107,7 +106,7 @@ public class Q00179_IntoTheLargeCavern extends Quest
}
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
htmltext = "32138-03.htm";
}
@@ -117,7 +116,7 @@ public class Q00179_IntoTheLargeCavern extends Quest
break;
}
}
- else if ((npc.getNpcId() == _nornil) && (st.getState() == State.STARTED))
+ else if ((npc.getNpcId() == MENACING_MACHINE) && (st.getState() == State.STARTED))
{
htmltext = "32258-01.html";
}
@@ -127,9 +126,8 @@ public class Q00179_IntoTheLargeCavern extends Quest
public Q00179_IntoTheLargeCavern(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(_kekropus);
- addTalkId(_kekropus, _nornil);
+ addStartNpc(KEKROPUS);
+ addTalkId(KEKROPUS, MENACING_MACHINE);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
index e043520869..0ce3071805 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java
@@ -28,10 +28,9 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00182_NewRecruits extends Quest
{
-
- // NPC's
- private static final int _kekropus = 32138;
- private static final int _nornil = 32258;
+ // NPCs
+ private static final int KEKROPUS = 32138;
+ private static final int MENACING_MACHINE = 32258;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -43,14 +42,14 @@ public class Q00182_NewRecruits extends Quest
return htmltext;
}
- if (npc.getNpcId() == _kekropus)
+ if (npc.getNpcId() == KEKROPUS)
{
if (event.equalsIgnoreCase("32138-03.html"))
{
st.startQuest();
}
}
- else if (npc.getNpcId() == _nornil)
+ else if (npc.getNpcId() == MENACING_MACHINE)
{
if (event.equalsIgnoreCase("32258-04.html"))
{
@@ -77,7 +76,7 @@ public class Q00182_NewRecruits extends Quest
}
final int npcId = npc.getNpcId();
- if (npcId == _kekropus)
+ if (npcId == KEKROPUS)
{
switch (st.getState())
{
@@ -107,7 +106,7 @@ public class Q00182_NewRecruits extends Quest
break;
}
}
- else if ((npcId == _nornil) && st.isStarted())
+ else if ((npcId == MENACING_MACHINE) && st.isStarted())
{
htmltext = "32258-01.html";
}
@@ -117,9 +116,8 @@ public class Q00182_NewRecruits extends Quest
public Q00182_NewRecruits(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(_kekropus);
- addTalkId(_kekropus, _nornil);
+ addStartNpc(KEKROPUS);
+ addTalkId(KEKROPUS, MENACING_MACHINE);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
index 329a5784f9..0b292da0f6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00192_SevenSignsSeriesOfDoubt/Q00192_SevenSignsSeriesOfDoubt.java
@@ -42,7 +42,6 @@ public class Q00192_SevenSignsSeriesOfDoubt extends Quest
public Q00192_SevenSignsSeriesOfDoubt(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(CROOP, UNIDENTIFIED_BODY);
addTalkId(CROOP, STAN, UNIDENTIFIED_BODY, HECTOR, HOLLINT);
registerQuestItems(CROOPS_INTRODUCTION, JACOBS_NECKLACE, CROOPS_LETTER);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index baea9e867e..a29a48128c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -54,7 +54,6 @@ public class Q00193_SevenSignsDyingMessage extends Quest
public Q00193_SevenSignsDyingMessage(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(HOLLINT);
addTalkId(HOLLINT, CAIN, ERIC, SIR_GUSTAV_ATHEBALDT);
addKillId(SHILENS_EVIL_THOUGHTS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
index aaad0e4ea0..4a353a9d59 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java
@@ -51,7 +51,6 @@ public class Q00194_SevenSignsMammonsContract extends Quest
public Q00194_SevenSignsMammonsContract(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(SIR_GUSTAV_ATHEBALDT);
addTalkId(SIR_GUSTAV_ATHEBALDT, COLIN, FROG, TESS, KUTA, CLAUDIA_ATHEBALDT);
registerQuestItems(ATHEBALDTS_INTRODUCTION, NATIVES_GLOVE, FROG_KINGS_BEAD, GRANDA_TESS_CANDY_POUCH);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index ca2b7755db..78531c2258 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -48,7 +48,6 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
public Q00197_SevenSignsTheSacredBookOfSeal(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(WOOD);
addTalkId(WOOD, ORVEN, LEOPARD, LAWRENCE, SOPHIA);
addKillId(SHILENS_EVIL_THOUGHTS);
@@ -364,7 +363,6 @@ public class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
NpcSay ns = new NpcSay(npc.getObjectId(), Say2.ALL, npc.getNpcId(), NpcStringId.S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU);
ns.addStringParameter(player.getName());
npc.broadcastPacket(ns);
-
return super.onKill(npc, player, isPet);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index 4e5c95cb23..de0a38c1a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -53,7 +53,6 @@ public class Q00198_SevenSignsEmbryo extends Quest
public Q00198_SevenSignsEmbryo(int questId, String name, String descr)
{
super(questId, name, descr);
-
addFirstTalkId(JAINA);
addStartNpc(WOOD);
addTalkId(WOOD, FRANZ);
@@ -282,7 +281,6 @@ public class Q00198_SevenSignsEmbryo extends Quest
NpcSay ns = new NpcSay(npc.getObjectId(), Say2.ALL, npc.getNpcId(), NpcStringId.S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU);
ns.addStringParameter(player.getName());
npc.broadcastPacket(ns);
-
return super.onKill(npc, player, isPet);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
index ba28a44248..80f1d79526 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -50,7 +50,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
22633
};
// Item
- private static final int STAKATOFANGS = 14879;
+ private static final int STAKATO_FANG = 14879;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -87,13 +87,13 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
switch (st.getCond())
{
case 1:
- htmltext = (!st.hasQuestItems(STAKATOFANGS)) ? "32640-8.html" : "32640-9.html";
+ htmltext = (!st.hasQuestItems(STAKATO_FANG)) ? "32640-8.html" : "32640-9.html";
break;
case 2:
- if (st.getQuestItemsCount(STAKATOFANGS) >= 25)
+ if (st.getQuestItemsCount(STAKATO_FANG) >= 25)
{
st.giveAdena(147200, true);
- st.takeItems(STAKATOFANGS, -1);
+ st.takeItems(STAKATO_FANG, -1);
st.addExpAndSp(589542, 36800);
st.exitQuest(false, true);
htmltext = "32640-10.html";
@@ -118,8 +118,8 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
}
final QuestState st = partyMember.getQuestState(getName());
- st.giveItems(STAKATOFANGS, 1);
- if (st.getQuestItemsCount(STAKATOFANGS) >= 25)
+ st.giveItems(STAKATO_FANG, 1);
+ if (st.getQuestItemsCount(STAKATO_FANG) >= 25)
{
st.setCond(2, true);
}
@@ -136,7 +136,7 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
addStartNpc(KINTAIJIN);
addTalkId(KINTAIJIN);
addKillId(MOBS);
- registerQuestItems(STAKATOFANGS);
+ registerQuestItems(STAKATO_FANG);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
index 14d23f1c87..6f56763454 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
@@ -38,14 +38,13 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
private static final int VIRGIL = 31742;
private static final int KASSANDRA = 31743;
private static final int OGMAR = 31744;
-
+ // Mobs
private static final int BARAHAM = 27113;
private static final int MALRUK_SUCCUBUS_1 = 20244;
private static final int MALRUK_SUCCUBUS_TUREN_1 = 20245;
private static final int MALRUK_SUCCUBUS_2 = 20283;
private static final int MALRUK_SUCCUBUS_TUREN_2 = 20284;
private static final int TAIK_ORC_SUPPLY_LEADER = 20669;
-
// Items
private static final int LEGEND_OF_SEVENTEEN = 7587;
private static final int MALRUK_SUCCUBUS_CLAW = 7597;
@@ -54,7 +53,6 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest
private static final int CRIMSON_MOSS = 7598;
private static final int RAHORAKTIS_MEDICINE = 7599;
private static final int VIRGILS_LETTER = 7677;
-
// Rewards
private static final int CRIMSON_MOSS_CHANCE = 30;
private static final int MALRUK_SUCCUBUS_CLAW_CHANCE = 60;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
index 2afcb5ed73..75cbe6f285 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
@@ -304,7 +304,7 @@ public class Q00242_PossessorOfAPreciousSoul2 extends Quest
final L2PcInstance partyMember = getRandomPartyMember(player, "awaitsDrops", "1");
if (partyMember == null)
{
- return null;
+ return super.onKill(npc, player, isPet);
}
final QuestState st = partyMember.getQuestState(getName());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
index dbe12316f3..c1c93b40fa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java
@@ -14,10 +14,10 @@
*/
package quests.Q00247_PossessorOfAPreciousSoul4;
-import com.l2jserver.gameserver.datatables.SkillTable;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
@@ -38,6 +38,8 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
private static final int NOBLESS_TIARA = 7694;
// Location
private static final Location CARADINE_LOC = new Location(143209, 43968, -3038);
+ // Skill
+ private static SkillHolder MIMIRS_ELIXIR = new SkillHolder(4339, 1);
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -72,7 +74,7 @@ public class Q00247_PossessorOfAPreciousSoul4 extends Quest
st.addExpAndSp(93836, 0);
st.giveItems(NOBLESS_TIARA, 1);
npc.setTarget(player);
- npc.doCast(SkillTable.getInstance().getInfo(4339, 1));
+ npc.doCast(MIMIRS_ELIXIR.getSkill());
player.sendPacket(new SocialAction(player.getObjectId(), 3));
st.exitQuest(false, true);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
index 9451e6fe3b..922286791d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java
@@ -27,9 +27,9 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
{
-
- private static final int _mouen = 30196;
- private static final int _johnny = 32744;
+ // NPCs
+ private static final int MOUEN = 30196;
+ private static final int JOHNNY = 32744;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -41,14 +41,14 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
return htmltext;
}
- if (npc.getNpcId() == _mouen)
+ if (npc.getNpcId() == MOUEN)
{
if (event.equalsIgnoreCase("30196-03.htm"))
{
st.startQuest();
}
}
- else if ((npc.getNpcId() == _johnny) && event.equalsIgnoreCase("32744-03.htm"))
+ else if ((npc.getNpcId() == JOHNNY) && event.equalsIgnoreCase("32744-03.htm"))
{
st.giveAdena(83056, true);
st.addExpAndSp(477496, 58743);
@@ -67,22 +67,15 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
return htmltext;
}
- if (npc.getNpcId() == _mouen)
+ if (npc.getNpcId() == MOUEN)
{
switch (st.getState())
{
case State.CREATED:
- if (player.getLevel() >= 82)
- {
- htmltext = "30196-01.htm";
- }
- else
- {
- htmltext = "30196-00.htm";
- }
+ htmltext = (player.getLevel() >= 82) ? "30196-01.htm" : "30196-00.htm";
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
htmltext = "30196-04.htm";
}
@@ -92,9 +85,9 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
break;
}
}
- else if (npc.getNpcId() == _johnny)
+ else if (npc.getNpcId() == JOHNNY)
{
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
htmltext = "32744-01.htm";
}
@@ -109,9 +102,8 @@ public class Q00249_PoisonedPlainsOfTheLizardmen extends Quest
public Q00249_PoisonedPlainsOfTheLizardmen(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(_mouen);
- addTalkId(_mouen, _johnny);
+ addStartNpc(MOUEN);
+ addTalkId(MOUEN, JOHNNY);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
index 4438575c51..390b5b552f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java
@@ -92,14 +92,7 @@ public class Q00250_WatchWhatYouEat extends Quest
switch (st.getState())
{
case State.CREATED:
- if (player.getLevel() >= 82)
- {
- htmltext = "32743-01.htm";
- }
- else
- {
- htmltext = "32743-00.htm";
- }
+ htmltext = (player.getLevel() >= 82) ? "32743-01.htm" : "32743-00.htm";
break;
case State.STARTED:
if (st.isCond(1))
@@ -179,7 +172,6 @@ public class Q00250_WatchWhatYouEat extends Quest
public Q00250_WatchWhatYouEat(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(SALLY);
addFirstTalkId(SALLY);
addTalkId(SALLY);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
index c47c1e41e0..9f5f53ab48 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
@@ -54,11 +54,7 @@ public class Q00251_NoSecrets extends Quest
addTalkId(PINAPS);
addKillId(MOBS);
addKillId(MOBS2);
- questItemIds = new int[]
- {
- DIARY,
- TABLE
- };
+ registerQuestItems(DIARY, TABLE);
}
@Override
@@ -93,15 +89,14 @@ public class Q00251_NoSecrets extends Quest
htmltext = (player.getLevel() > 81) ? "30201-01.htm" : "30201-00.htm";
break;
case State.STARTED:
- int cond = st.getInt("cond");
- if (cond == 1)
+ if (st.isCond(1))
{
htmltext = "30201-05.htm";
}
- else if ((cond == 2) && (st.getQuestItemsCount(DIARY) >= 10) && (st.getQuestItemsCount(TABLE) >= 5))
+ else if ((st.isCond(2)) && (st.getQuestItemsCount(DIARY) >= 10) && (st.getQuestItemsCount(TABLE) >= 5))
{
htmltext = "30201-04.htm";
- st.rewardItems(57, 313355);
+ st.giveAdena(313355, true);
st.addExpAndSp(56787, 160578);
st.exitQuest(false, true);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
index ef2336b272..35e950f4b7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00252_ItSmellsDelicious/Q00252_ItSmellsDelicious.java
@@ -27,8 +27,7 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
/**
- * It Smells Delicious! (252)
- * Updated by corbin12, thanks VLight for help.
+ * It Smells Delicious! (252) Updated by corbin12, thanks VLight for help.
* @author Dumpster
*/
public class Q00252_ItSmellsDelicious extends Quest
@@ -49,14 +48,11 @@ public class Q00252_ItSmellsDelicious extends Quest
public Q00252_ItSmellsDelicious(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(STAN);
addTalkId(STAN);
addKillId(CHEF);
- for (final int i : MOBS)
- {
- addKillId(i);
- }
+ addKillId(MOBS);
+ registerQuestItems(MAHUM_DIARY, MAHUM_COOKBOOK);
}
@Override
@@ -77,9 +73,7 @@ public class Q00252_ItSmellsDelicious extends Quest
}
else if (event.equalsIgnoreCase("30200-08.htm"))
{
- st.takeItems(MAHUM_DIARY, -1);
- st.takeItems(MAHUM_COOKBOOK, -1);
- st.giveItems(57, 147656);
+ st.giveAdena(147656, true);
st.addExpAndSp(716238, 78324);
st.exitQuest(false, true);
}
@@ -102,21 +96,14 @@ public class Q00252_ItSmellsDelicious extends Quest
switch (st.getState())
{
case State.CREATED:
- if (player.getLevel() >= 82)
- {
- htmltext = "30200-01.htm";
- }
- else
- {
- htmltext = "30200-02.htm";
- }
+ htmltext = (player.getLevel() >= 82) ? "30200-01.htm" : "30200-02.htm";
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
htmltext = "30200-06.htm";
}
- else if (st.getInt("cond") == 2)
+ else if (st.isCond(2))
{
if ((st.getQuestItemsCount(MAHUM_DIARY) >= 10) && (st.getQuestItemsCount(MAHUM_COOKBOOK) >= 5))
{
@@ -153,7 +140,7 @@ public class Q00252_ItSmellsDelicious extends Quest
else if (npcId == CHEF)
{
st = player.getQuestState(getName());
- if ((st != null) && st.isStarted() && (st.getInt("cond") == 1) && (st.getQuestItemsCount(MAHUM_COOKBOOK) < 5) && (getRandom(1000) < 360))
+ if ((st != null) && st.isStarted() && (st.isCond(1)) && (st.getQuestItemsCount(MAHUM_COOKBOOK) < 5) && (getRandom(1000) < 360))
{
st.giveItems(MAHUM_COOKBOOK, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
@@ -180,7 +167,7 @@ public class Q00252_ItSmellsDelicious extends Quest
if ((party == null) || party.getMembers().isEmpty())
{
st = player.getQuestState(getName());
- if ((st == null) || st.isStarted() || (st.getInt("cond") != 1) || (st.getQuestItemsCount(MAHUM_DIARY) >= 10))
+ if ((st == null) || st.isStarted() || (!st.isCond(1)) || (st.getQuestItemsCount(MAHUM_DIARY) >= 10))
{
return null;
}
@@ -204,7 +191,7 @@ public class Q00252_ItSmellsDelicious extends Quest
}
st = partyMember.getQuestState(getName());
- if ((st == null) || (st.getState() != State.STARTED) || (st.getInt("cond") != 1) || (st.getQuestItemsCount(MAHUM_DIARY) >= 10))
+ if ((st == null) || (st.getState() != State.STARTED) || (!st.isCond(1)) || (st.getQuestItemsCount(MAHUM_DIARY) >= 10))
{
continue;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
index b591459155..79e3142e02 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java
@@ -61,14 +61,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
{
case State.CREATED:
final QuestState qs = player.getQuestState(Q10288_SecretMission.class.getSimpleName());
- if ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted())
- {
- htmltext = "32757-01.htm";
- }
- else
- {
- htmltext = "32757-03.html";
- }
+ htmltext = ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "32757-01.htm" : "32757-03.html";
break;
case State.STARTED:
if (st.isCond(1))
@@ -353,8 +346,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
* @param killer the killer of the npc
* @param npc the killed npc
* @param chance the reward chance
- * @param atLeastOne if {@code true} it will reward two items if the chance is meet and one if the chance is not meet,
- * if {@code false} if the chance is not meet doesn't reward, otherwise reward one item
+ * @param atLeastOne if {@code true} it will reward two items if the chance is meet and one if the chance is not meet, if {@code false} if the chance is not meet doesn't reward, otherwise reward one item
*/
private void giveItem(L2PcInstance killer, L2Npc npc, int chance, boolean atLeastOne)
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
index 59120001c9..57de82b9e9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java
@@ -27,15 +27,15 @@ import com.l2jserver.gameserver.model.quest.State;
public class Q00278_HomeSecurity extends Quest
{
// NPC
- private static final int Tunatun = 31537;
- private static final int[] Monster =
+ private static final int TUNATUN = 31537;
+ private static final int[] MONSTER =
{
18905,
18906,
18907
};
// Item
- private static final int SelMahumMane = 15531;
+ private static final int SEL_MAHUM_MANE = 15531;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -112,8 +112,6 @@ public class Q00278_HomeSecurity extends Quest
st.giveItems(959, 1);
}
- st.takeItems(SelMahumMane, -1);
- st.unset("cond");
st.exitQuest(true, true);
htmltext = "31537-07.html";
}
@@ -136,11 +134,11 @@ public class Q00278_HomeSecurity extends Quest
htmltext = "31537-01.htm";
break;
case State.STARTED:
- if ((st.getInt("cond") == 1) || (st.getQuestItemsCount(SelMahumMane) < 300))
+ if (st.isCond(1) || (st.getQuestItemsCount(SEL_MAHUM_MANE) < 300))
{
htmltext = "31537-06.html";
}
- else if ((st.getInt("cond") == 2) && (st.getQuestItemsCount(SelMahumMane) >= 300))
+ else if (st.isCond(2) && (st.getQuestItemsCount(SEL_MAHUM_MANE) >= 300))
{
htmltext = "31537-05.html";
}
@@ -160,7 +158,7 @@ public class Q00278_HomeSecurity extends Quest
final QuestState st = partyMember.getQuestState(getName());
int chance, i1;
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
switch (npc.getNpcId())
{
@@ -169,8 +167,8 @@ public class Q00278_HomeSecurity extends Quest
chance = getRandom(1000);
if (chance < 85)
{
- st.giveItems(SelMahumMane, 1);
- if (st.getQuestItemsCount(SelMahumMane) >= 300)
+ st.giveItems(SEL_MAHUM_MANE, 1);
+ if (st.getQuestItemsCount(SEL_MAHUM_MANE) >= 300)
{
st.setCond(2, true);
}
@@ -185,28 +183,28 @@ public class Q00278_HomeSecurity extends Quest
if (chance < 486)
{
i1 = getRandom(6) + 1;
- if ((i1 + st.getQuestItemsCount(SelMahumMane)) >= 300)
+ if ((i1 + st.getQuestItemsCount(SEL_MAHUM_MANE)) >= 300)
{
- st.giveItems(SelMahumMane, (300 - st.getQuestItemsCount(SelMahumMane)));
+ st.giveItems(SEL_MAHUM_MANE, (300 - st.getQuestItemsCount(SEL_MAHUM_MANE)));
st.setCond(2, true);
}
else
{
- st.giveItems(SelMahumMane, i1);
+ st.giveItems(SEL_MAHUM_MANE, i1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
else
{
i1 = (getRandom(5) + 1);
- if ((i1 + st.getQuestItemsCount(SelMahumMane)) >= 300)
+ if ((i1 + st.getQuestItemsCount(SEL_MAHUM_MANE)) >= 300)
{
- st.giveItems(SelMahumMane, (300 - st.getQuestItemsCount(SelMahumMane)));
+ st.giveItems(SEL_MAHUM_MANE, (300 - st.getQuestItemsCount(SEL_MAHUM_MANE)));
st.setCond(2, true);
}
else
{
- st.giveItems(SelMahumMane, i1);
+ st.giveItems(SEL_MAHUM_MANE, i1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
@@ -219,15 +217,10 @@ public class Q00278_HomeSecurity extends Quest
public Q00278_HomeSecurity(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(Tunatun);
- addTalkId(Tunatun);
- addKillId(Monster);
-
- questItemIds = new int[]
- {
- SelMahumMane
- };
+ addStartNpc(TUNATUN);
+ addTalkId(TUNATUN);
+ addKillId(MONSTER);
+ registerQuestItems(SEL_MAHUM_MANE);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
index e08582416d..b02643fcc8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java
@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public final class Q00279_TargetOfOpportunity extends Quest
{
- // NPC's
+ // NPCs
private static final int JERIAN = 32302;
private static final int[] MONSTERS =
{
@@ -55,7 +55,6 @@ public final class Q00279_TargetOfOpportunity extends Quest
public Q00279_TargetOfOpportunity(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(JERIAN);
addTalkId(JERIAN);
addKillId(MONSTERS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
index 1263faf2f7..7cc09d7e57 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00287_FiguringItOut extends Quest
{
- // NPC
+ // NPCs
private static final int LAKI = 32742;
private static final Map<Integer, Integer> MONSTERS = new HashMap<>();
@@ -49,7 +49,6 @@ public class Q00287_FiguringItOut extends Quest
// Items
private static final int VIAL_OF_TANTA_BLOOD = 15499;
-
// Rewards
private static final ItemHolder[] MOIRAI =
{
@@ -195,7 +194,6 @@ public class Q00287_FiguringItOut extends Quest
addStartNpc(LAKI);
addTalkId(LAKI);
addKillId(MONSTERS.keySet());
-
registerQuestItems(VIAL_OF_TANTA_BLOOD);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
index 229582583d..a2da07b9fb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
@@ -29,9 +29,12 @@ import com.l2jserver.gameserver.util.Util;
*/
public class Q00289_NoMoreSoupForYou extends Quest
{
+ // NPC
public static final int STAN = 30200;
- public static final int RATE = 5;
+ // Item
public static final int SOUP = 15712;
+ // Misc
+ public static final int RATE = 5;
private static final int[] MOBS =
{
@@ -153,14 +156,9 @@ public class Q00289_NoMoreSoupForYou extends Quest
public Q00289_NoMoreSoupForYou(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(STAN);
addTalkId(STAN);
-
- for (int i : MOBS)
- {
- addKillId(i);
- }
+ addKillId(MOBS);
}
@Override
@@ -229,26 +227,12 @@ public class Q00289_NoMoreSoupForYou extends Quest
{
case State.CREATED:
QuestState _prev = player.getQuestState(Q00252_ItSmellsDelicious.class.getSimpleName());
- if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82))
- {
- htmltext = "30200-01.htm";
- }
- else
- {
- htmltext = "30200-00.htm";
- }
+ htmltext = ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82)) ? "30200-01.htm" : "30200-00.htm";
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
- if (st.getQuestItemsCount(SOUP) >= 100)
- {
- htmltext = "30200-04.htm";
- }
- else
- {
- htmltext = "30200-03.htm";
- }
+ htmltext = (st.getQuestItemsCount(SOUP) >= 100) ? "30200-04.htm" : "30200-03.htm";
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
index 67b9c7f7ec..a9dbe16c8f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
@@ -61,7 +61,6 @@ public class Q00290_ThreatRemoval extends Quest
public Q00290_ThreatRemoval(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(PINAPS);
addTalkId(PINAPS);
addKillId(MOBS_TAG.keySet());
@@ -167,7 +166,6 @@ public class Q00290_ThreatRemoval extends Quest
break;
}
}
-
return htmltext;
}
@@ -198,7 +196,6 @@ public class Q00290_ThreatRemoval extends Quest
break;
}
}
-
return htmltext;
}
@@ -208,18 +205,17 @@ public class Q00290_ThreatRemoval extends Quest
final L2PcInstance partyMember = getRandomPartyMember(player, "1");
if (partyMember == null)
{
- return null;
+ return super.onKill(npc, player, isPet);
}
final QuestState st = partyMember.getQuestState(getName());
int npcId = npc.getNpcId();
- int chance = (int) ((MOBS_TAG.get(npcId) * Config.RATE_QUEST_DROP) % 1000);
+ float chance = (MOBS_TAG.get(npcId) * Config.RATE_QUEST_DROP);
if (getRandom(1000) < chance)
{
st.rewardItems(SEL_MAHUM_ID_TAG, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
-
return super.onKill(npc, player, isPet);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
index 0e52e87cae..b5e2ce399d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java
@@ -29,19 +29,16 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
{
// NPC
private final static 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;
-
// 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;
-
// Misc
private final static int RESPAWN_DELAY = 3600000; // 1 hour
private static L2Npc hekaton;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
index 3eba46667f..255be7eba1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.util.Util;
*/
public class Q00309_ForAGoodCause extends Quest
{
- // NPC's
+ // NPC
private static final int ATRA = 32647;
// Mobs
private static final int CONTAMINATED_MUCROKIAN = 22654;
@@ -326,7 +326,6 @@ public class Q00309_ForAGoodCause extends Quest
public Q00309_ForAGoodCause(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(ATRA);
addTalkId(ATRA);
addKillId(MUCROKIANS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
index 3b25ef781e..e185d6bf6f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java
@@ -34,12 +34,10 @@ public class Q00310_OnlyWhatRemains extends Quest
{
// NPC
private static final int KINTAIJIN = 32640;
-
// Items
private static final int GROW_ACCELERATOR = 14832;
private static final int MULTI_COLORED_JEWEL = 14835;
private static final int DIRTY_BEAD = 14880;
-
// Monsters
private static final Map<Integer, Integer> MOBS = new HashMap<>();
@@ -160,7 +158,6 @@ public class Q00310_OnlyWhatRemains extends Quest
addStartNpc(KINTAIJIN);
addTalkId(KINTAIJIN);
addKillId(MOBS.keySet());
-
registerQuestItems(DIRTY_BEAD);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
index 2df5c54b14..e1a6714714 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java
@@ -298,13 +298,8 @@ public class Q00350_EnhanceYourWeapon extends Quest
public Q00350_EnhanceYourWeapon(int questId, String name, String descr)
{
super(questId, name, descr);
-
- for (int npcId : STARTING_NPCS)
- {
- addStartNpc(npcId);
- addTalkId(npcId);
- }
-
+ addStartNpc(STARTING_NPCS);
+ addTalkId(STARTING_NPCS);
load();
for (int npcId : _npcLevelingInfos.keySet())
{
@@ -326,7 +321,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
{
return null;
}
- if (!(npc instanceof L2Attackable) || npc.isDead() || !_npcLevelingInfos.containsKey(npc.getNpcId()))
+ if (!npc.isL2Attackable() || npc.isDead() || !_npcLevelingInfos.containsKey(npc.getNpcId()))
{
return null;
}
@@ -345,7 +340,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isPet)
{
- if ((npc instanceof L2Attackable) && _npcLevelingInfos.containsKey(npc.getNpcId()))
+ if (npc.isL2Attackable() && _npcLevelingInfos.containsKey(npc.getNpcId()))
{
levelSoulCrystals((L2Attackable) npc, killer);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
index 851dd0e584..a264c23fe9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.util.Util;
*/
public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
{
- // NPC's
+ // NPC
private static final int SOBLING = 31147;
// Items
private static final int ANCIENT_PARCHMENT = 14841;
@@ -193,7 +193,6 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
public Q00376_ExplorationOfTheGiantsCavePart1(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(SOBLING);
addTalkId(SOBLING);
addKillId(MOBS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
index e08f278123..60f5231673 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.util.Util;
*/
public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
{
- // NPC's
+ // NPC
private static final int SOBLING = 31147;
// Items
private static final int TITAN_ANCIENT_BOOK = 14847;
@@ -140,7 +140,7 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
return null;
}
- if ((st.getInt("cond") == 1) && (getRandom(100) < DROP_CHANCE))
+ if ((st.isCond(1)) && (getRandom(100) < DROP_CHANCE))
{
st.giveItems(TITAN_ANCIENT_BOOK, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
@@ -167,7 +167,6 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
public Q00377_ExplorationOfTheGiantsCavePart2(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(SOBLING);
addTalkId(SOBLING);
addKillId(MOBS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00401_PathToWarrior/Q00401_PathToWarrior.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00401_PathToWarrior/Q00401_PathToWarrior.java
index 190a5055c1..8870992772 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00401_PathToWarrior/Q00401_PathToWarrior.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00401_PathToWarrior/Q00401_PathToWarrior.java
@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.SocialAction;
*/
public class Q00401_PathToWarrior extends Quest
{
- // Item
+ // Items
private static final int AURONSLETTER = 1138;
private static final int WARRIORGUILDMARK = 1139;
private static final int RUSTEDBRONZESWORD1 = 1140;
@@ -38,7 +38,7 @@ public class Q00401_PathToWarrior extends Quest
private static final int SIMPLONSLETTER = 1143;
private static final int POISONSPIDERLEG = 1144;
private static final int MEDALLIONOFWARRIOR = 1145;
- // Npc
+ // NPCs
private static final int AURON = 30010;
private static final int SIMPLON = 30253;
private static final int[] MONSTERS =
@@ -260,7 +260,7 @@ public class Q00401_PathToWarrior extends Quest
}
case 5:
{
- if ((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == RUSTEDBRONZESWORD3) && (npc.getNpcId() == MONSTERS[1]) || (npc.getNpcId() == MONSTERS[3]))
+ if (((st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == RUSTEDBRONZESWORD3) && (npc.getNpcId() == MONSTERS[1])) || (npc.getNpcId() == MONSTERS[3]))
{
if (st.getQuestItemsCount(POISONSPIDERLEG) < 20)
{
@@ -282,10 +282,8 @@ public class Q00401_PathToWarrior extends Quest
public Q00401_PathToWarrior(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(AURON);
- addTalkId(AURON);
- addTalkId(SIMPLON);
+ addTalkId(AURON, SIMPLON);
addKillId(MONSTERS);
registerQuestItems(AURONSLETTER, WARRIORGUILDMARK, RUSTEDBRONZESWORD1, RUSTEDBRONZESWORD2, RUSTEDBRONZESWORD3, SIMPLONSLETTER, POISONSPIDERLEG);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
index cc38d436d4..a1b00cac63 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java
@@ -33,16 +33,16 @@ import com.l2jserver.gameserver.util.Util;
public class Q00423_TakeYourBestShot extends Quest
{
// NPC
- private static final int _batracos = 32740;
- private static final int _johnny = 32744;
+ private static final int BATRACOS = 32740;
+ private static final int JOHNNY = 32744;
// Item
- private static final int _seer_ugoros_pass = 15496;
+ private static final int SEER_UGOROS_PASS = 15496;
// Spawn chance x/1000
- private static final int _spawn_chance = 2;
+ private static final int SPAWN_CHANCE = 2;
// Guard
- private static final int _tanta_guard = 18862;
+ private static final int TANTA_LIZARDMAN_GUARD = 18862;
// Mobs
- private static final int[] _mobs =
+ private static final int[] MOBS =
{
22768,
22769,
@@ -64,7 +64,7 @@ public class Q00423_TakeYourBestShot extends Quest
return htmltext;
}
- if (npc.getNpcId() == _johnny)
+ if (npc.getNpcId() == JOHNNY)
{
if (event.equalsIgnoreCase("32744-04.htm"))
{
@@ -81,14 +81,14 @@ public class Q00423_TakeYourBestShot extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- String htmltext = "<html><body>You are either not on a quest that involves this NPC, or you don't meet this NPC's minimum quest requirements.</body></html>";
QuestState st = player.getQuestState(getName());
+ String htmltext = getNoQuestMsg(player);
if (st == null)
{
return htmltext;
}
- if (npc.getNpcId() == _johnny)
+ if (npc.getNpcId() == JOHNNY)
{
switch (st.getState())
{
@@ -96,14 +96,7 @@ public class Q00423_TakeYourBestShot extends Quest
QuestState _prev = player.getQuestState(Q00249_PoisonedPlainsOfTheLizardmen.class.getSimpleName());
if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82))
{
- if (st.hasQuestItems(_seer_ugoros_pass))
- {
- htmltext = "32744-07.htm";
- }
- else
- {
- htmltext = "32744-01.htm";
- }
+ htmltext = (st.hasQuestItems(SEER_UGOROS_PASS)) ? "32744-07.htm" : "32744-01.htm";
}
else
{
@@ -111,38 +104,30 @@ public class Q00423_TakeYourBestShot extends Quest
}
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
htmltext = "32744-05.htm";
}
- else if (st.getInt("cond") == 2)
+ else if (st.isCond(2))
{
htmltext = "32744-06.htm";
}
break;
}
}
- else if (npc.getNpcId() == _batracos)
+ else if (npc.getNpcId() == BATRACOS)
{
if (st.getState() == State.CREATED)
{
- if (st.hasQuestItems(_seer_ugoros_pass))
- {
- htmltext = "32740-05.htm";
- }
- else
- {
- htmltext = "32740-00.htm";
- }
+ htmltext = (st.hasQuestItems(SEER_UGOROS_PASS)) ? "32740-05.htm" : "32740-00.htm";
}
- else if ((st.getState() == State.STARTED) && (st.getInt("cond") == 1))
+ else if ((st.getState() == State.STARTED) && (st.isCond(1)))
{
htmltext = "32740-02.htm";
}
- else if ((st.getState() == State.STARTED) && (st.getInt("cond") == 2))
+ else if ((st.getState() == State.STARTED) && (st.isCond(2)))
{
- st.giveItems(_seer_ugoros_pass, 1);
- st.unset("cond");
+ st.giveItems(SEER_UGOROS_PASS, 1);
st.exitQuest(true, true);
htmltext = "32740-04.htm";
}
@@ -175,12 +160,12 @@ public class Q00423_TakeYourBestShot extends Quest
return null;
}
- if (Util.contains(_mobs, npc.getNpcId()) && (getRandom(1000) <= _spawn_chance))
+ if (Util.contains(MOBS, npc.getNpcId()) && (getRandom(1000) <= SPAWN_CHANCE))
{
- L2Npc guard = addSpawn(_tanta_guard, npc, false);
+ L2Npc guard = addSpawn(TANTA_LIZARDMAN_GUARD, npc, false);
attackPlayer((L2Attackable) guard, player);
}
- else if ((npc.getNpcId() == _tanta_guard) && (st.getInt("cond") == 1))
+ else if ((npc.getNpcId() == TANTA_LIZARDMAN_GUARD) && (st.isCond(1)))
{
st.setCond(2, true);
}
@@ -197,18 +182,11 @@ public class Q00423_TakeYourBestShot extends Quest
public Q00423_TakeYourBestShot(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(_johnny);
- addTalkId(_johnny);
- addStartNpc(_batracos);
- addTalkId(_batracos);
- addFirstTalkId(_batracos);
-
- addKillId(_tanta_guard);
- for (int _mob : _mobs)
- {
- addKillId(_mob);
- }
+ addStartNpc(JOHNNY, BATRACOS);
+ addTalkId(JOHNNY, BATRACOS);
+ addFirstTalkId(BATRACOS);
+ addKillId(TANTA_LIZARDMAN_GUARD);
+ addKillId(MOBS);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
index f1b2e52ead..a3b9c31554 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java
@@ -30,13 +30,10 @@ public class Q00432_BirthdayPartySong extends Quest
{
// NPC
private static final int OCTAVIA = 31043;
-
// Monster
private static final int GOLEM = 21103;
-
// Item
private static final int RED_CRYSTAL = 7541;
-
// Reward
private static final int ECHO_CRYSTAL = 7061;
@@ -121,7 +118,6 @@ public class Q00432_BirthdayPartySong extends Quest
addStartNpc(OCTAVIA);
addTalkId(OCTAVIA);
addKillId(GOLEM);
-
registerQuestItems(RED_CRYSTAL);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
index b5445f2bea..213b6fc9e0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java
@@ -39,7 +39,7 @@ public class Q00450_GraveRobberRescue extends Quest
private static final int WARRIOR = 32651;
// Monster
private static final int WARRIOR_MON = 22741;
- // Items
+ // Item
private static final int EVIDENCE_OF_MIGRATION = 14876;
// Misc
private static final int MIN_LEVEL = 80;
@@ -104,14 +104,7 @@ public class Q00450_GraveRobberRescue extends Quest
case State.STARTED:
if (st.isCond(1))
{
- if (!st.hasQuestItems(EVIDENCE_OF_MIGRATION))
- {
- htmltext = "32650-08.html";
- }
- else
- {
- htmltext = "32650-09.html";
- }
+ htmltext = (!st.hasQuestItems(EVIDENCE_OF_MIGRATION)) ? "32650-08.html" : "32650-09.html";
}
else
{
@@ -173,7 +166,6 @@ public class Q00450_GraveRobberRescue extends Quest
super(questId, name, descr);
addStartNpc(KANEMIKA);
addTalkId(KANEMIKA, WARRIOR);
-
registerQuestItems(EVIDENCE_OF_MIGRATION);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
index 66b6b43e22..ba0db83eed 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java
@@ -42,7 +42,6 @@ public class Q00451_LuciensAltar extends Quest
// Items
private static final int REPLENISHED_BEAD = 14877;
private static final int DISCHARGED_BEAD = 14878;
-
// Misc
private static final int MIN_LEVEL = 80;
@@ -148,7 +147,6 @@ public class Q00451_LuciensAltar extends Quest
addStartNpc(DAICHIR);
addTalkId(ALTARS);
addTalkId(DAICHIR);
-
registerQuestItems(REPLENISHED_BEAD, DISCHARGED_BEAD);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
index 4356a81c54..e12f398326 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java
@@ -136,7 +136,6 @@ public class Q00452_FindingtheLostSoldiers extends Quest
public Q00452_FindingtheLostSoldiers(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(JAKAN);
addTalkId(JAKAN);
addTalkId(SOLDIER_CORPSES);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
index 6ec6ee0dca..de7013f755 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -33,8 +33,8 @@ import com.l2jserver.util.Rnd;
public class Q00453_NotStrongEnoughAlone extends Quest
{
// NPC
- private static final int Klemis = 32734;
- private static final int[] Monsters1 =
+ private static final int KLEMIS = 32734;
+ private static final int[] MONSTER1 =
{
22746,
22747,
@@ -45,7 +45,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
22752,
22753
};
- private static final int[] Monsters2 =
+ private static final int[] MONSTER2 =
{
22754,
22755,
@@ -54,7 +54,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
22758,
22759
};
- private static final int[] Monsters3 =
+ private static final int[] MONSTER3 =
{
22760,
22761,
@@ -65,7 +65,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
};
// Reward
- private static final int[][] Reward =
+ private static final int[][] REWARD =
{
{
15815,
@@ -149,7 +149,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
}
break;
case State.STARTED:
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
{
@@ -173,7 +173,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
}
case 5:
{
- st.giveItems(Reward[Rnd.get(Reward.length)][getRandom(Reward[0].length)], 1);
+ st.giveItems(REWARD[Rnd.get(REWARD.length)][getRandom(REWARD[0].length)], 1);
st.exitQuest(QuestType.DAILY, true);
htmltext = "32734-14.html";
break;
@@ -234,23 +234,23 @@ public class Q00453_NotStrongEnoughAlone extends Quest
{
final ExQuestNpcLogList log = new ExQuestNpcLogList(getQuestIntId());
- if (Util.contains(Monsters1, npcId) && (st.getInt("cond") == 2))
+ if (Util.contains(MONSTER1, npcId) && st.isCond(2))
{
- if (npcId == Monsters1[4])
+ if (npcId == MONSTER1[4])
{
- npcId = Monsters1[0];
+ npcId = MONSTER1[0];
}
- else if (npcId == Monsters1[5])
+ else if (npcId == MONSTER1[5])
{
- npcId = Monsters1[1];
+ npcId = MONSTER1[1];
}
- else if (npcId == Monsters1[6])
+ else if (npcId == MONSTER1[6])
{
- npcId = Monsters1[2];
+ npcId = MONSTER1[2];
}
- else if (npcId == Monsters1[7])
+ else if (npcId == MONSTER1[7])
{
- npcId = Monsters1[3];
+ npcId = MONSTER1[3];
}
int i = st.getInt(String.valueOf(npcId));
@@ -260,26 +260,26 @@ public class Q00453_NotStrongEnoughAlone extends Quest
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
- checkProgress(st, 15, Monsters1[0], Monsters1[1], Monsters1[2], Monsters1[3]);
+ checkProgress(st, 15, MONSTER1[0], MONSTER1[1], MONSTER1[2], MONSTER1[3]);
- log.addNpc(Monsters1[0], st.getInt(String.valueOf(Monsters1[0])));
- log.addNpc(Monsters1[1], st.getInt(String.valueOf(Monsters1[1])));
- log.addNpc(Monsters1[2], st.getInt(String.valueOf(Monsters1[2])));
- log.addNpc(Monsters1[3], st.getInt(String.valueOf(Monsters1[3])));
+ log.addNpc(MONSTER1[0], st.getInt(String.valueOf(MONSTER1[0])));
+ log.addNpc(MONSTER1[1], st.getInt(String.valueOf(MONSTER1[1])));
+ log.addNpc(MONSTER1[2], st.getInt(String.valueOf(MONSTER1[2])));
+ log.addNpc(MONSTER1[3], st.getInt(String.valueOf(MONSTER1[3])));
}
- else if (Util.contains(Monsters2, npcId) && (st.getInt("cond") == 3))
+ else if (Util.contains(MONSTER2, npcId) && st.isCond(3))
{
- if (npcId == Monsters2[3])
+ if (npcId == MONSTER2[3])
{
- npcId = Monsters2[0];
+ npcId = MONSTER2[0];
}
- else if (npcId == Monsters2[4])
+ else if (npcId == MONSTER2[4])
{
- npcId = Monsters2[1];
+ npcId = MONSTER2[1];
}
- else if (npcId == Monsters2[5])
+ else if (npcId == MONSTER2[5])
{
- npcId = Monsters2[2];
+ npcId = MONSTER2[2];
}
int i = st.getInt(String.valueOf(npcId));
@@ -289,25 +289,25 @@ public class Q00453_NotStrongEnoughAlone extends Quest
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
- checkProgress(st, 20, Monsters2[0], Monsters2[1], Monsters2[2]);
+ checkProgress(st, 20, MONSTER2[0], MONSTER2[1], MONSTER2[2]);
- log.addNpc(Monsters2[0], st.getInt(String.valueOf(Monsters2[0])));
- log.addNpc(Monsters2[1], st.getInt(String.valueOf(Monsters2[1])));
- log.addNpc(Monsters2[2], st.getInt(String.valueOf(Monsters2[2])));
+ log.addNpc(MONSTER2[0], st.getInt(String.valueOf(MONSTER2[0])));
+ log.addNpc(MONSTER2[1], st.getInt(String.valueOf(MONSTER2[1])));
+ log.addNpc(MONSTER2[2], st.getInt(String.valueOf(MONSTER2[2])));
}
- else if (Util.contains(Monsters3, npcId) && (st.getInt("cond") == 4))
+ else if (Util.contains(MONSTER3, npcId) && st.isCond(4))
{
- if (npcId == Monsters3[3])
+ if (npcId == MONSTER3[3])
{
- npcId = Monsters3[0];
+ npcId = MONSTER3[0];
}
- else if (npcId == Monsters3[4])
+ else if (npcId == MONSTER3[4])
{
- npcId = Monsters3[1];
+ npcId = MONSTER3[1];
}
- else if (npcId == Monsters3[5])
+ else if (npcId == MONSTER3[5])
{
- npcId = Monsters3[2];
+ npcId = MONSTER3[2];
}
int i = st.getInt(String.valueOf(npcId));
@@ -317,11 +317,11 @@ public class Q00453_NotStrongEnoughAlone extends Quest
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
- checkProgress(st, 20, Monsters3[0], Monsters3[1], Monsters3[2]);
+ checkProgress(st, 20, MONSTER3[0], MONSTER3[1], MONSTER3[2]);
- log.addNpc(Monsters3[0], st.getInt(String.valueOf(Monsters3[0])));
- log.addNpc(Monsters3[1], st.getInt(String.valueOf(Monsters3[1])));
- log.addNpc(Monsters3[2], st.getInt(String.valueOf(Monsters3[2])));
+ log.addNpc(MONSTER3[0], st.getInt(String.valueOf(MONSTER3[0])));
+ log.addNpc(MONSTER3[1], st.getInt(String.valueOf(MONSTER3[1])));
+ log.addNpc(MONSTER3[2], st.getInt(String.valueOf(MONSTER3[2])));
}
player.sendPacket(log);
}
@@ -342,11 +342,11 @@ public class Q00453_NotStrongEnoughAlone extends Quest
public Q00453_NotStrongEnoughAlone(int questId, String name, String descr)
{
super(questId, name, descr);
- addStartNpc(Klemis);
- addTalkId(Klemis);
- addKillId(Monsters1);
- addKillId(Monsters2);
- addKillId(Monsters3);
+ addStartNpc(KLEMIS);
+ addTalkId(KLEMIS);
+ addKillId(MONSTER1);
+ addKillId(MONSTER2);
+ addKillId(MONSTER3);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
index bc1e6ab847..dae4fac20d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java
@@ -217,7 +217,7 @@ public class Q00455_WingsOfSand extends Quest
private static final void reward(QuestState st)
{
int chance;
- for (int i = 1; i <= st.getCond() - 1; i++)
+ for (int i = 1; i <= (st.getCond() - 1); i++)
{
chance = getRandom(1000);
if (chance <= 250)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
index f4f4e69d1c..c6f535c55f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java
@@ -200,7 +200,7 @@ public final class Q00457_LostAndFound extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
{
- if (_gumiel == null && getRandom(100) < CHANCE_SPAWN)
+ if ((_gumiel == null) && (getRandom(100) < CHANCE_SPAWN))
{
addSpawn(GUMIEL, new Location(npc.getX(), npc.getY(), npc.getZ()), false, 0);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
index f9b936c000..27e587e4bb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java
@@ -34,11 +34,9 @@ public class Q00461_RumbleInTheBase extends Quest
{
// NPC
private static final int STAN = 30200;
-
- // Item
+ // Items
private static final int SHINY_SALMON = 15503;
private static final int SHOES_STRING_OF_SEL_MAHUM = 16382;
-
// Mobs
private static final Map<Integer, Integer> MONSTERS = new HashMap<>();
@@ -168,7 +166,6 @@ public class Q00461_RumbleInTheBase extends Quest
addStartNpc(STAN);
addTalkId(STAN);
addKillId(MONSTERS.keySet());
-
registerQuestItems(SHINY_SALMON, SHOES_STRING_OF_SEL_MAHUM);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
index c057e644e8..89d3ff8d3f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java
@@ -36,11 +36,9 @@ public class Q00463_IMustBeaGenius extends Quest
{
// NPC
private static final int GUTENHAGEN = 32069;
-
// Items
private static final int CORPSE_LOG = 15510;
private static final int COLLECTION = 15511;
-
// Mobs
private static final Map<Integer, DropInfo> MOBS = new HashMap<>();
@@ -220,7 +218,6 @@ public class Q00463_IMustBeaGenius extends Quest
addStartNpc(GUTENHAGEN);
addTalkId(GUTENHAGEN);
addKillId(MOBS.keySet());
-
registerQuestItems(COLLECTION, CORPSE_LOG);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
index 832383ecf6..6fa4abdbca 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
@@ -52,7 +52,6 @@ public class Q00464_Oath extends Quest
private static final int STRONGBOX = 15537;
private static final int BOOK = 15538;
private static final int BOOK2 = 15539;
-
// Monsters
private static final Map<Integer, Integer> MOBS = new HashMap<>();
@@ -264,7 +263,6 @@ public class Q00464_Oath extends Quest
addTalkId(npc[0]);
}
addKillId(MOBS.keySet());
-
registerQuestItems(BOOK, BOOK2);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00504_CompetitionfortheBanditStronghold/Q00504_CompetitionfortheBanditStronghold.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00504_CompetitionfortheBanditStronghold/Q00504_CompetitionfortheBanditStronghold.java
index a67af2bc02..b4829a3b25 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00504_CompetitionfortheBanditStronghold/Q00504_CompetitionfortheBanditStronghold.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00504_CompetitionfortheBanditStronghold/Q00504_CompetitionfortheBanditStronghold.java
@@ -58,10 +58,7 @@ public final class Q00504_CompetitionfortheBanditStronghold extends Quest
super(questId, name, descr);
addStartNpc(MESSENGER);
addTalkId(MESSENGER);
- for (int mob : MOBS)
- {
- addKillId(mob);
- }
+ addKillId(MOBS);
}
@Override
@@ -105,7 +102,7 @@ public final class Q00504_CompetitionfortheBanditStronghold extends Quest
{
result = "azit_messenger_q0504_02.htm";
st.setState(State.STARTED);
- st.set("cond", "1");
+ st.setCond(1);
}
break;
case State.STARTED:
@@ -149,7 +146,7 @@ public final class Q00504_CompetitionfortheBanditStronghold extends Quest
return null;
}
- if (st.isStarted() && (st.getInt("cond") == 1))
+ if (st.isStarted() && st.isCond(1))
{
st.giveItems(TARLK_AMULET, 1);
if (st.getQuestItemsCount(TARLK_AMULET) < 30)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
index 9f632d266d..2d13716631 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java
@@ -200,7 +200,6 @@ public class Q00508_AClansReputation extends Quest
public Q00508_AClansReputation(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(SIR_ERIC_RODEMAI);
addTalkId(SIR_ERIC_RODEMAI);
addKillId(RAID_BOSS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
index 50631ac394..9783f4b8a1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java
@@ -187,7 +187,6 @@ public class Q00509_AClansFame extends Quest
public Q00509_AClansFame(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(VALDIS);
addTalkId(VALDIS);
addKillId(RAID_BOSS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
index 841c314f28..326e495d50 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java
@@ -30,10 +30,8 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
*/
public class Q00510_AClansPrestige extends Quest
{
-
// NPC
private static final int VALDIS = 31331;
-
// Quest Item
private static final int TYRANNOSAURUS_CLAW = 8767;
@@ -143,7 +141,6 @@ public class Q00510_AClansPrestige extends Quest
public Q00510_AClansPrestige(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(VALDIS);
addTalkId(VALDIS);
addKillId(MOBS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
index 88e243b096..7efc3e1f04 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -83,10 +83,8 @@ public final class Q00511_AwlUnderFoot extends Quest
// QUEST ITEMS
private static final int DL_MARK = 9797;
-
// REWARDS
private static final int KNIGHT_EPALUETTE = 9912;
-
// MONSTER TO KILL -- Only last 3 Raids (lvl ordered) give DL_MARK
protected static final int[] RAIDS1 =
{
@@ -107,7 +105,7 @@ public final class Q00511_AwlUnderFoot extends Quest
25592,
25593
};
-
+ // Skill
private static final SkillHolder RAID_CURSE = new SkillHolder(5456, 1);
private String checkConditions(L2PcInstance player)
@@ -470,18 +468,9 @@ public final class Q00511_AwlUnderFoot extends Quest
addTalkId(i);
}
- for (int i : RAIDS1)
- {
- addKillId(i);
- }
- for (int i : RAIDS2)
- {
- addKillId(i);
- }
- for (int i : RAIDS3)
- {
- addKillId(i);
- }
+ addKillId(RAIDS1);
+ addKillId(RAIDS2);
+ addKillId(RAIDS3);
for (int i = 25572; i <= 25595; i++)
{
@@ -491,7 +480,6 @@ public final class Q00511_AwlUnderFoot extends Quest
public static void main(String[] args)
{
- // now call the constructor (starts up the)
new Q00511_AwlUnderFoot(511, Q00511_AwlUnderFoot.class.getSimpleName(), "instances");
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
index 7d3fbd6f2a..36d8f347c2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java
@@ -42,7 +42,6 @@ public class Q00551_OlympiadStarter extends Quest
public Q00551_OlympiadStarter(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(MANAGER);
addTalkId(MANAGER);
registerQuestItems(CERT_3, CERT_5, CERT_10);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
index 2444fbb4fc..a1eb32ed00 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java
@@ -30,26 +30,20 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00552_OlympiadVeteran extends Quest
{
+ // NPC
private static final int MANAGER = 31688;
-
- private static final int Team_Event_Certificate = 17241;
- private static final int Class_Free_Battle_Certificate = 17242;
- private static final int Class_Battle_Certificate = 17243;
-
+ // Items
+ private static final int TEAM_EVENT_CERTIFICATE = 17241;
+ private static final int CLASS_FREE_BATTLE_CERTIFICATE = 17242;
+ private static final int CLASS_BATTLE_CERTIFICATE = 17243;
private static final int OLY_CHEST = 17169;
public Q00552_OlympiadVeteran(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(MANAGER);
addTalkId(MANAGER);
- questItemIds = new int[]
- {
- Team_Event_Certificate,
- Class_Free_Battle_Certificate,
- Class_Battle_Certificate
- };
+ registerQuestItems(TEAM_EVENT_CERTIFICATE, CLASS_FREE_BATTLE_CERTIFICATE, CLASS_BATTLE_CERTIFICATE);
setOlympiadUse(true);
}
@@ -69,7 +63,7 @@ public class Q00552_OlympiadVeteran extends Quest
}
else if (event.equalsIgnoreCase("31688-04.html"))
{
- final long count = st.getQuestItemsCount(Team_Event_Certificate) + st.getQuestItemsCount(Class_Free_Battle_Certificate) + st.getQuestItemsCount(Class_Battle_Certificate);
+ final long count = st.getQuestItemsCount(TEAM_EVENT_CERTIFICATE) + st.getQuestItemsCount(CLASS_FREE_BATTLE_CERTIFICATE) + st.getQuestItemsCount(CLASS_BATTLE_CERTIFICATE);
if (count > 0)
{
@@ -119,7 +113,7 @@ public class Q00552_OlympiadVeteran extends Quest
}
else if (st.isStarted())
{
- final long count = st.getQuestItemsCount(Team_Event_Certificate) + st.getQuestItemsCount(Class_Free_Battle_Certificate) + st.getQuestItemsCount(Class_Battle_Certificate);
+ final long count = st.getQuestItemsCount(TEAM_EVENT_CERTIFICATE) + st.getQuestItemsCount(CLASS_FREE_BATTLE_CERTIFICATE) + st.getQuestItemsCount(CLASS_BATTLE_CERTIFICATE);
if (count == 3)
{
@@ -150,9 +144,9 @@ public class Q00552_OlympiadVeteran extends Quest
{
matches = st.getInt("classed") + 1;
st.set("classed", String.valueOf(matches));
- if ((matches == 5) && !st.hasQuestItems(Class_Battle_Certificate))
+ if ((matches == 5) && !st.hasQuestItems(CLASS_BATTLE_CERTIFICATE))
{
- st.giveItems(Class_Battle_Certificate, 1);
+ st.giveItems(CLASS_BATTLE_CERTIFICATE, 1);
}
break;
}
@@ -160,9 +154,9 @@ public class Q00552_OlympiadVeteran extends Quest
{
matches = st.getInt("nonclassed") + 1;
st.set("nonclassed", String.valueOf(matches));
- if ((matches == 5) && !st.hasQuestItems(Class_Free_Battle_Certificate))
+ if ((matches == 5) && !st.hasQuestItems(CLASS_FREE_BATTLE_CERTIFICATE))
{
- st.giveItems(Class_Free_Battle_Certificate, 1);
+ st.giveItems(CLASS_FREE_BATTLE_CERTIFICATE, 1);
}
break;
}
@@ -170,9 +164,9 @@ public class Q00552_OlympiadVeteran extends Quest
{
matches = st.getInt("teams") + 1;
st.set("teams", String.valueOf(matches));
- if ((matches == 5) && !st.hasQuestItems(Team_Event_Certificate))
+ if ((matches == 5) && !st.hasQuestItems(TEAM_EVENT_CERTIFICATE))
{
- st.giveItems(Team_Event_Certificate, 1);
+ st.giveItems(TEAM_EVENT_CERTIFICATE, 1);
}
break;
}
@@ -198,7 +192,7 @@ public class Q00552_OlympiadVeteran extends Quest
st.set("classed", String.valueOf(matches));
if (matches == 5)
{
- st.giveItems(Class_Battle_Certificate, 1);
+ st.giveItems(CLASS_BATTLE_CERTIFICATE, 1);
}
break;
}
@@ -208,7 +202,7 @@ public class Q00552_OlympiadVeteran extends Quest
st.set("nonclassed", String.valueOf(matches));
if (matches == 5)
{
- st.giveItems(Class_Free_Battle_Certificate, 1);
+ st.giveItems(CLASS_FREE_BATTLE_CERTIFICATE, 1);
}
break;
}
@@ -218,7 +212,7 @@ public class Q00552_OlympiadVeteran extends Quest
st.set("teams", String.valueOf(matches));
if (matches == 5)
{
- st.giveItems(Team_Event_Certificate, 1);
+ st.giveItems(TEAM_EVENT_CERTIFICATE, 1);
}
break;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
index 2c79abf1bc..492bf1c6c4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java
@@ -30,19 +30,18 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00553_OlympiadUndefeated extends Quest
{
+ // NPC
private static final int MANAGER = 31688;
-
+ // Items
private static final int WIN_CONF_2 = 17244;
private static final int WIN_CONF_5 = 17245;
private static final int WIN_CONF_10 = 17246;
-
private static final int OLY_CHEST = 17169;
private static final int MEDAL_OF_GLORY = 21874;
public Q00553_OlympiadUndefeated(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(MANAGER);
addTalkId(MANAGER);
registerQuestItems(WIN_CONF_2, WIN_CONF_5, WIN_CONF_10);
@@ -120,7 +119,7 @@ public class Q00553_OlympiadUndefeated extends Quest
else
{
final long count = st.getQuestItemsCount(WIN_CONF_2) + st.getQuestItemsCount(WIN_CONF_5) + st.getQuestItemsCount(WIN_CONF_10);
- if ((count == 3) && (st.getInt("cond") == 2))
+ if ((count == 3) && st.isCond(2))
{
st.giveItems(OLY_CHEST, 4);
st.giveItems(MEDAL_OF_GLORY, 5);
@@ -141,7 +140,7 @@ public class Q00553_OlympiadUndefeated extends Quest
if (winner != null)
{
final QuestState st = winner.getQuestState(getName());
- if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
+ if ((st != null) && st.isStarted() && (st.isCond(1)))
{
final int matches = st.getInt("undefeatable") + 1;
st.set("undefeatable", String.valueOf(matches));
@@ -163,7 +162,7 @@ public class Q00553_OlympiadUndefeated extends Quest
if (!st.hasQuestItems(WIN_CONF_10))
{
st.giveItems(WIN_CONF_10, 1);
- st.set("cond", "2");
+ st.setCond(2);
}
break;
}
@@ -177,7 +176,7 @@ public class Q00553_OlympiadUndefeated extends Quest
if (loser != null)
{
final QuestState st = loser.getQuestState(getName());
- if ((st != null) && st.isStarted() && (st.getInt("cond") == 1))
+ if ((st != null) && st.isStarted() && (st.isCond(1)))
{
st.unset("undefeatable");
st.takeItems(WIN_CONF_2, -1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
index 80a35b6ca3..f207a1b02f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java
@@ -32,10 +32,8 @@ public class Q00601_WatchingEyes extends Quest
{
// NPC
private static final int EYE_OF_ARGOS = 31683;
-
// Item
private static final int PROOF_OF_AVENGER = 7188;
-
// Monsters
private static final Map<Integer, Integer> MOBS = new HashMap<>();
@@ -147,7 +145,6 @@ public class Q00601_WatchingEyes extends Quest
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
-
return super.onKill(npc, player, isPet);
}
@@ -157,7 +154,6 @@ public class Q00601_WatchingEyes extends Quest
addStartNpc(EYE_OF_ARGOS);
addTalkId(EYE_OF_ARGOS);
addKillId(MOBS.keySet());
-
registerQuestItems(PROOF_OF_AVENGER);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
index cc126da669..8feec12300 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java
@@ -29,10 +29,8 @@ public class Q00602_ShadowOfLight extends Quest
{
// NPC
private static final int EYE_OF_ARGOS = 31683;
-
// Item
private static final int EYE_OF_DARKNESS = 7189;
-
// Monsters
private static final int[] MOBS =
{
@@ -163,7 +161,6 @@ public class Q00602_ShadowOfLight extends Quest
addStartNpc(EYE_OF_ARGOS);
addTalkId(EYE_OF_ARGOS);
addKillId(MOBS);
-
registerQuestItems(EYE_OF_DARKNESS);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
index 49f0fc6f7e..ab7eb7faa4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
@@ -32,10 +32,8 @@ public class Q00617_GatherTheFlames extends Quest
private static final int HILDA = 31271;
private static final int VULCAN = 31539;
private static final int ROONEY = 32049;
-
// Item
private static final int TORCH = 7264;
-
// Reward
private static final int[] REWARD =
{
@@ -95,7 +93,7 @@ public class Q00617_GatherTheFlames extends Quest
case "31539-06.html":
break;
case "31539-07.html":
- if (st.getQuestItemsCount(TORCH) < 1000 || !st.isStarted())
+ if ((st.getQuestItemsCount(TORCH) < 1000) || !st.isStarted())
{
return getNoQuestMsg(player);
}
@@ -113,7 +111,7 @@ public class Q00617_GatherTheFlames extends Quest
case "6895":
case "6897":
case "6899":
- if (st.getQuestItemsCount(TORCH) < 1200 || !st.isStarted())
+ if ((st.getQuestItemsCount(TORCH) < 1200) || !st.isStarted())
{
return getNoQuestMsg(player);
}
@@ -122,7 +120,7 @@ public class Q00617_GatherTheFlames extends Quest
break;
case "6887":
case "6881":
- if (st.getQuestItemsCount(TORCH) < 1200 || !st.isStarted())
+ if ((st.getQuestItemsCount(TORCH) < 1200) || !st.isStarted())
{
return getNoQuestMsg(player);
}
@@ -213,7 +211,6 @@ public class Q00617_GatherTheFlames extends Quest
addStartNpc(HILDA, VULCAN);
addTalkId(ROONEY, HILDA, VULCAN);
addKillId(MOBS.keySet());
-
registerQuestItems(TORCH);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
index 8b814840c8..67c9544944 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00631_DeliciousTopChoiceMeat extends Quest
{
- // NPCs
+ // NPC
private static final int TUNATUN = 31537;
// Items
private static final int TOP_QUALITY_MEAT = 7546;
@@ -84,7 +84,6 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
public Q00631_DeliciousTopChoiceMeat(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(TUNATUN);
addTalkId(TUNATUN);
addKillId(MOBS_MEAT.keySet());
@@ -232,7 +231,7 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
final QuestState st = partyMember.getQuestState(getName());
int npcId = npc.getNpcId();
- int chance = (int) ((MOBS_MEAT.get(npcId) * Config.RATE_QUEST_DROP) % 1000);
+ float chance = (MOBS_MEAT.get(npcId) * Config.RATE_QUEST_DROP);
if (getRandom(1000) < chance)
{
st.rewardItems(PRIME_MEAT, 1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
index cda11da34b..2b5dfc104e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java
@@ -39,7 +39,6 @@ public final class Q00636_TruthBeyond extends Quest
public Q00636_TruthBeyond(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(ELIYAH);
addTalkId(ELIYAH, FLAURON);
addEnterZoneId(ZONE);
@@ -99,7 +98,7 @@ public final class Q00636_TruthBeyond extends Quest
}
else if (st.getState() == State.STARTED) // Flauron only
{
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
return "32010-01.htm";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
index a91e02f84f..7d1cdbd8d7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java
@@ -45,7 +45,6 @@ public final class Q00637_ThroughOnceMore extends Quest
public Q00637_ThroughOnceMore(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(FLAURON);
addTalkId(FLAURON);
addKillId(MOBS);
@@ -69,7 +68,6 @@ public final class Q00637_ThroughOnceMore extends Quest
{
st.exitQuest(true);
}
-
return event;
}
@@ -107,7 +105,7 @@ public final class Q00637_ThroughOnceMore extends Quest
}
else if (id == State.STARTED)
{
- if ((st.getInt("cond") == 2) && (st.getQuestItemsCount(NECRO_HEART) == 10))
+ if ((st.isCond(2)) && (st.getQuestItemsCount(NECRO_HEART) == 10))
{
st.takeItems(NECRO_HEART, 10);
st.takeItems(FADED_MARK, 1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
index 1d7b66bb09..39bcf61eb9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java
@@ -125,7 +125,6 @@ public class Q00641_AttackSailren extends Quest
public Q00641_AttackSailren(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(SHILENS_STONE_STATUE);
addTalkId(SHILENS_STONE_STATUE);
addKillId(MOBS);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
index b5fa411319..4defccb84b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00642_APowerfulPrimevalCreature/Q00642_APowerfulPrimevalCreature.java
@@ -123,14 +123,14 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
final L2PcInstance partyMember = getRandomPartyMember(player, "1");
if (partyMember == null)
{
- return null;
+ return super.onKill(npc, player, isPet);
}
final QuestState st = partyMember.getQuestState(getName());
int npcId = npc.getNpcId();
if (MOBS_TISSUE.containsKey(npcId))
{
- int chance = (int) ((MOBS_TISSUE.get(npcId) * Config.RATE_QUEST_DROP) % 1000);
+ float chance = (MOBS_TISSUE.get(npcId) * Config.RATE_QUEST_DROP);
if (getRandom(1000) < chance)
{
st.rewardItems(DINOSAUR_TISSUE, 1);
@@ -148,7 +148,6 @@ public class Q00642_APowerfulPrimevalCreature extends Quest
public Q00642_APowerfulPrimevalCreature(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(DINN);
addTalkId(DINN);
addKillId(ANCIENT_EGG);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
index f79e180c36..58ea25c7c8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -91,7 +91,6 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
public Q00643_RiseAndFallOfTheElrokiTribe(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(SINGSING);
addTalkId(SINGSING, KARAKAWEI);
addKillId(MOBS1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
index 2ac2ec9cc7..f3ae23ba85 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
@@ -26,13 +26,11 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00651_RunawayYouth extends Quest
{
- // NPC
+ // NPCs
private static final int BATIDAE = 31989;
private static final int IVAN = 32014;
-
// Item
private static final int SOE = 736;
-
// Misc
private static final int MIN_LEVEL = 26;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
index 37fad960fc..609b33cf34 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java
@@ -29,7 +29,6 @@ public class Q00652_AnAgedExAdventurer extends Quest
// NPCs
private static final int TANTAN = 32012;
private static final int SARA = 30180;
-
// Items
private static final int SOULSHOT_C = 1464;
private static final int ENCHANT_ARMOR_D = 956;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
index be7d37632e..2b236e3baf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java
@@ -26,16 +26,14 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00653_WildMaiden extends Quest
{
- // NPC
+ // NPCs
private static final int GALIBREDO = 30181;
private static final int SUKI = 32013;
-
// Item
private static final int SOE = 736;
-
// Misc
private static final int MIN_LEVEL = 36;
-
+
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
@@ -59,10 +57,7 @@ public class Q00653_WildMaiden extends Quest
st.startQuest();
st.takeItems(SOE, 1);
npc.deleteMe();
- if (getRandom(2) == 0)
- htmltext = event;
- else
- htmltext = "32013-04a.htm";
+ htmltext = (getRandom(2) == 0) ? event : "32013-04a.htm";
}
return htmltext;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
index 4ca4ac1399..5c1a103068 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00654_JourneyToASettlement/Q00654_JourneyToASettlement.java
@@ -51,7 +51,6 @@ public class Q00654_JourneyToASettlement extends Quest
public Q00654_JourneyToASettlement(int id, String name, String descr)
{
super(id, name, descr);
-
addStartNpc(NAMELESS_SPIRIT);
addTalkId(NAMELESS_SPIRIT);
addKillId(MOBS_SKIN.keySet());
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
index ba766744a3..985a4e83a7 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -39,7 +39,6 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
public Q00688_DefeatTheElrokianRaiders(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(DINN);
addTalkId(DINN);
addKillId(ELROKI);
@@ -112,7 +111,6 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
htmltext = event;
break;
}
-
}
return htmltext;
}
@@ -149,12 +147,12 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
final L2PcInstance partyMember = getRandomPartyMember(player, "1");
if (partyMember == null)
{
- return null;
+ return super.onKill(npc, player, isPet);
}
final QuestState st = partyMember.getQuestState(getName());
- int chance = (int) ((DROP_RATE * Config.RATE_QUEST_DROP) % 1000);
+ float chance = (DROP_RATE * Config.RATE_QUEST_DROP);
if (getRandom(1000) < chance)
{
st.rewardItems(DINOSAUR_FANG_NECKLACE, 1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
index 7f9565fcb2..842cd01dce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java
@@ -27,11 +27,10 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q00690_JudesRequest extends Quest
{
- // NPC
+ // NPCs
private static final int JUDE = 32356;
private static final int LESSER_EVIL = 22398;
private static final int GREATER_EVIL = 22399;
-
// Items
private static final int EVIL_WEAPON = 10327;
private static final int[][] REWARDS =
@@ -188,11 +187,9 @@ public class Q00690_JudesRequest extends Quest
public Q00690_JudesRequest(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(JUDE);
addTalkId(JUDE);
- addKillId(LESSER_EVIL);
- addKillId(GREATER_EVIL);
+ addKillId(LESSER_EVIL, GREATER_EVIL);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
index 130ca12759..bc6c3e1835 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
@@ -30,10 +30,8 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public final class Q00691_MatrasSuspiciousRequest extends Quest
{
-
- // NPCs
+ // NPC
private static final int MATRAS = 32245;
-
// Items
private static final int RED_GEM = 10372;
private static final int DYNASTY_SOUL_II = 10413;
@@ -57,14 +55,9 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
public Q00691_MatrasSuspiciousRequest(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(MATRAS);
addTalkId(MATRAS);
-
- for (int npcId : REWARD_CHANCES.keySet())
- {
- addKillId(npcId);
- }
+ addKillId(REWARD_CHANCES.keySet());
}
@Override
@@ -112,7 +105,7 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest
}
else if (event.equalsIgnoreCase("32245-12.htm"))
{
- st.giveItems(57, (st.getInt("submitted_gems") * 10000));
+ st.giveAdena((st.getInt("submitted_gems") * 10000), true);
st.exitQuest(true, true);
}
return htmltext;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
index 702ae16770..c7dc50ffd5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
@@ -43,58 +43,58 @@ public final class Q00692_HowtoOpposeEvil extends Quest
15536
};
- private static final Map<Integer, ItemHolder> _questMobs = new HashMap<>();
+ private static final Map<Integer, ItemHolder> QUEST_MOBS = new HashMap<>();
static
{
// Seed of Infinity
- _questMobs.put(22509, new ItemHolder(13863, 500));
- _questMobs.put(22510, new ItemHolder(13863, 500));
- _questMobs.put(22511, new ItemHolder(13863, 500));
- _questMobs.put(22512, new ItemHolder(13863, 500));
- _questMobs.put(22513, new ItemHolder(13863, 500));
- _questMobs.put(22514, new ItemHolder(13863, 500));
- _questMobs.put(22515, new ItemHolder(13863, 500));
+ QUEST_MOBS.put(22509, new ItemHolder(13863, 500));
+ QUEST_MOBS.put(22510, new ItemHolder(13863, 500));
+ QUEST_MOBS.put(22511, new ItemHolder(13863, 500));
+ QUEST_MOBS.put(22512, new ItemHolder(13863, 500));
+ QUEST_MOBS.put(22513, new ItemHolder(13863, 500));
+ QUEST_MOBS.put(22514, new ItemHolder(13863, 500));
+ QUEST_MOBS.put(22515, new ItemHolder(13863, 500));
// Seed of Destruction
- _questMobs.put(22537, new ItemHolder(13865, 250));
- _questMobs.put(22538, new ItemHolder(13865, 250));
- _questMobs.put(22539, new ItemHolder(13865, 250));
- _questMobs.put(22540, new ItemHolder(13865, 250));
- _questMobs.put(22541, new ItemHolder(13865, 250));
- _questMobs.put(22542, new ItemHolder(13865, 250));
- _questMobs.put(22543, new ItemHolder(13865, 250));
- _questMobs.put(22544, new ItemHolder(13865, 250));
- _questMobs.put(22546, new ItemHolder(13865, 250));
- _questMobs.put(22547, new ItemHolder(13865, 250));
- _questMobs.put(22548, new ItemHolder(13865, 250));
- _questMobs.put(22549, new ItemHolder(13865, 250));
- _questMobs.put(22550, new ItemHolder(13865, 250));
- _questMobs.put(22551, new ItemHolder(13865, 250));
- _questMobs.put(22552, new ItemHolder(13865, 250));
- _questMobs.put(22593, new ItemHolder(13865, 250));
- _questMobs.put(22596, new ItemHolder(13865, 250));
- _questMobs.put(22597, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22537, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22538, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22539, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22540, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22541, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22542, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22543, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22544, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22546, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22547, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22548, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22549, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22550, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22551, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22552, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22593, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22596, new ItemHolder(13865, 250));
+ QUEST_MOBS.put(22597, new ItemHolder(13865, 250));
// Seed of Annihilation
- _questMobs.put(22746, new ItemHolder(15536, 125));
- _questMobs.put(22747, new ItemHolder(15536, 125));
- _questMobs.put(22748, new ItemHolder(15536, 125));
- _questMobs.put(22749, new ItemHolder(15536, 125));
- _questMobs.put(22750, new ItemHolder(15536, 125));
- _questMobs.put(22751, new ItemHolder(15536, 125));
- _questMobs.put(22752, new ItemHolder(15536, 125));
- _questMobs.put(22753, new ItemHolder(15536, 125));
- _questMobs.put(22754, new ItemHolder(15536, 125));
- _questMobs.put(22755, new ItemHolder(15536, 125));
- _questMobs.put(22756, new ItemHolder(15536, 125));
- _questMobs.put(22757, new ItemHolder(15536, 125));
- _questMobs.put(22758, new ItemHolder(15536, 125));
- _questMobs.put(22759, new ItemHolder(15536, 125));
- _questMobs.put(22760, new ItemHolder(15536, 125));
- _questMobs.put(22761, new ItemHolder(15536, 125));
- _questMobs.put(22762, new ItemHolder(15536, 125));
- _questMobs.put(22763, new ItemHolder(15536, 125));
- _questMobs.put(22764, new ItemHolder(15536, 125));
- _questMobs.put(22765, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22746, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22747, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22748, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22749, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22750, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22751, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22752, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22753, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22754, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22755, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22756, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22757, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22758, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22759, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22760, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22761, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22762, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22763, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22764, new ItemHolder(15536, 125));
+ QUEST_MOBS.put(22765, new ItemHolder(15536, 125));
}
private static final boolean giveReward(QuestState st, int itemId, int minCount, int rewardItemId, long rewardCount)
@@ -125,7 +125,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest
}
else if (event.equalsIgnoreCase("32550-04.htm"))
{
- st.set("cond", "3");
+ st.setCond(3);
}
else if (event.equalsIgnoreCase("32550-07.htm"))
{
@@ -188,27 +188,26 @@ public final class Q00692_HowtoOpposeEvil extends Quest
}
else
{
- final int cond = st.getInt("cond");
if (npc.getNpcId() == DILIOS)
{
- if ((cond == 1) && st.hasQuestItems(LEKONS_CERTIFICATE))
+ if (st.isCond(1) && st.hasQuestItems(LEKONS_CERTIFICATE))
{
htmltext = "32549-04.htm";
st.takeItems(LEKONS_CERTIFICATE, -1);
- st.set("cond", "2");
+ st.setCond(2);
}
- else if (cond == 2)
+ else if (st.isCond(2))
{
htmltext = "32549-05.htm";
}
}
else
{
- if (cond == 2)
+ if (st.isCond(2))
{
htmltext = "32550-01.htm";
}
- else if (cond == 3)
+ else if (st.isCond(3))
{
for (int i : QUEST_ITEMS)
{
@@ -234,9 +233,9 @@ public final class Q00692_HowtoOpposeEvil extends Quest
}
final QuestState st = partyMember.getQuestState(getName());
final int npcId = npc.getNpcId();
- if ((st != null) && _questMobs.containsKey(npcId))
+ if ((st != null) && QUEST_MOBS.containsKey(npcId))
{
- int chance = (int) (_questMobs.get(npcId).getCount() * Config.RATE_QUEST_DROP);
+ int chance = (int) (QUEST_MOBS.get(npcId).getCount() * Config.RATE_QUEST_DROP);
int numItems = chance / 1000;
chance = chance % 1000;
if (getRandom(1000) < chance)
@@ -245,7 +244,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest
}
if (numItems > 0)
{
- st.giveItems(_questMobs.get(npcId).getId(), numItems);
+ st.giveItems(QUEST_MOBS.get(npcId).getId(), numItems);
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
@@ -258,7 +257,7 @@ public final class Q00692_HowtoOpposeEvil extends Quest
addStartNpc(DILIOS);
addTalkId(DILIOS);
addTalkId(32550);
- addKillId(_questMobs.keySet());
+ addKillId(QUEST_MOBS.keySet());
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
index 518f18b737..8bd9d47a9d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java
@@ -29,10 +29,10 @@ import com.l2jserver.gameserver.model.quest.State;
public class Q00702_ATrapForRevenge extends Quest
{
// NPC
- private static final int Plenos = 32563;
- private static final int Lekon = 32557;
- private static final int Tenius = 32555;
- private static final int[] Monsters =
+ private static final int PLENOS = 32563;
+ private static final int LEKON = 32557;
+ private static final int TENIUS = 32555;
+ private static final int[] MONSTERS =
{
22612,
22613,
@@ -43,11 +43,11 @@ public class Q00702_ATrapForRevenge extends Quest
25626
};
// Items
- private static final int DrakeFlesh = 13877;
- private static final int RottenBlood = 13878;
- private static final int BaitForDrakes = 13879;
- private static final int VariantDrakeWingHorns = 13880;
- private static final int ExtractedRedStarStone = 14009;
+ private static final int DRAKES_FLESH = 13877;
+ private static final int ROTTEN_BLOOD = 13878;
+ private static final int BAIT_FOR_DRAKES = 13879;
+ private static final int VARIANT_DRAKE_WING_HORNS = 13880;
+ private static final int EXTRACTED_RED_STAR_STONE = 14009;
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -65,19 +65,19 @@ public class Q00702_ATrapForRevenge extends Quest
}
else if (event.equalsIgnoreCase("32563-07.html"))
{
- htmltext = st.hasQuestItems(DrakeFlesh) ? "32563-08.html" : "32563-07.html";
+ htmltext = st.hasQuestItems(DRAKES_FLESH) ? "32563-08.html" : "32563-07.html";
}
else if (event.equalsIgnoreCase("32563-09.html"))
{
- st.giveAdena(st.getQuestItemsCount(DrakeFlesh) * 100, false);
- st.takeItems(DrakeFlesh, -1);
+ st.giveAdena(st.getQuestItemsCount(DRAKES_FLESH) * 100, false);
+ st.takeItems(DRAKES_FLESH, -1);
}
else if (event.equalsIgnoreCase("32563-11.html"))
{
- if (st.hasQuestItems(VariantDrakeWingHorns))
+ if (st.hasQuestItems(VARIANT_DRAKE_WING_HORNS))
{
- st.giveAdena(st.getQuestItemsCount(VariantDrakeWingHorns) * 200000, false);
- st.takeItems(VariantDrakeWingHorns, -1);
+ st.giveAdena(st.getQuestItemsCount(VARIANT_DRAKE_WING_HORNS) * 200000, false);
+ st.takeItems(VARIANT_DRAKE_WING_HORNS, -1);
htmltext = "32563-12.html";
}
else
@@ -91,23 +91,23 @@ public class Q00702_ATrapForRevenge extends Quest
}
else if (event.equalsIgnoreCase("32557-03.html"))
{
- if (!st.hasQuestItems(RottenBlood) && (st.getQuestItemsCount(ExtractedRedStarStone) < 100))
+ if (!st.hasQuestItems(ROTTEN_BLOOD) && (st.getQuestItemsCount(EXTRACTED_RED_STAR_STONE) < 100))
{
htmltext = "32557-03.html";
}
- else if (st.hasQuestItems(RottenBlood) && (st.getQuestItemsCount(ExtractedRedStarStone) < 100))
+ else if (st.hasQuestItems(ROTTEN_BLOOD) && (st.getQuestItemsCount(EXTRACTED_RED_STAR_STONE) < 100))
{
htmltext = "32557-04.html";
}
- else if (!st.hasQuestItems(RottenBlood) && (st.getQuestItemsCount(ExtractedRedStarStone) >= 100))
+ else if (!st.hasQuestItems(ROTTEN_BLOOD) && (st.getQuestItemsCount(EXTRACTED_RED_STAR_STONE) >= 100))
{
htmltext = "32557-05.html";
}
- else if (st.hasQuestItems(RottenBlood) && (st.getQuestItemsCount(ExtractedRedStarStone) >= 100))
+ else if (st.hasQuestItems(ROTTEN_BLOOD) && (st.getQuestItemsCount(EXTRACTED_RED_STAR_STONE) >= 100))
{
- st.giveItems(BaitForDrakes, 1);
- st.takeItems(RottenBlood, 1);
- st.takeItems(ExtractedRedStarStone, 100);
+ st.giveItems(BAIT_FOR_DRAKES, 1);
+ st.takeItems(ROTTEN_BLOOD, 1);
+ st.takeItems(EXTRACTED_RED_STAR_STONE, 100);
htmltext = "32557-06.html";
}
}
@@ -121,7 +121,7 @@ public class Q00702_ATrapForRevenge extends Quest
}
else if (event.equalsIgnoreCase("32555-06.html"))
{
- if (st.getQuestItemsCount(DrakeFlesh) < 100)
+ if (st.getQuestItemsCount(DRAKES_FLESH) < 100)
{
htmltext = "32555-06.html";
}
@@ -132,12 +132,12 @@ public class Q00702_ATrapForRevenge extends Quest
}
else if (event.equalsIgnoreCase("32555-08.html"))
{
- st.giveItems(RottenBlood, 1);
- st.takeItems(DrakeFlesh, 100);
+ st.giveItems(ROTTEN_BLOOD, 1);
+ st.takeItems(DRAKES_FLESH, 100);
}
else if (event.equalsIgnoreCase("32555-10.html"))
{
- if (st.hasQuestItems(VariantDrakeWingHorns))
+ if (st.hasQuestItems(VARIANT_DRAKE_WING_HORNS))
{
htmltext = "32555-11.html";
}
@@ -245,7 +245,7 @@ public class Q00702_ATrapForRevenge extends Quest
htmltext = "32555-18.html";
}
- st.takeItems(VariantDrakeWingHorns, 1);
+ st.takeItems(VARIANT_DRAKE_WING_HORNS, 1);
}
return htmltext;
}
@@ -260,7 +260,7 @@ public class Q00702_ATrapForRevenge extends Quest
return htmltext;
}
- if (npc.getNpcId() == Plenos)
+ if (npc.getNpcId() == PLENOS)
{
switch (st.getState())
{
@@ -269,15 +269,15 @@ public class Q00702_ATrapForRevenge extends Quest
htmltext = ((prev != null) && prev.isCompleted() && (player.getLevel() >= 78)) ? "32563-01.htm" : "32563-02.htm";
break;
case State.STARTED:
- htmltext = (st.getInt("cond") == 1) ? "32563-05.html" : "32563-06.html";
+ htmltext = (st.isCond(1)) ? "32563-05.html" : "32563-06.html";
break;
}
}
if (st.getState() == State.STARTED)
{
- if (npc.getNpcId() == Lekon)
+ if (npc.getNpcId() == LEKON)
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
htmltext = "32557-01.html";
@@ -287,9 +287,9 @@ public class Q00702_ATrapForRevenge extends Quest
break;
}
}
- else if (npc.getNpcId() == Tenius)
+ else if (npc.getNpcId() == TENIUS)
{
- switch (st.getInt("cond"))
+ switch (st.getCond())
{
case 1:
htmltext = "32555-01.html";
@@ -318,57 +318,57 @@ public class Q00702_ATrapForRevenge extends Quest
case 22612:
if (chance < 413)
{
- st.giveItems(DrakeFlesh, 2);
+ st.giveItems(DRAKES_FLESH, 2);
}
else
{
- st.giveItems(DrakeFlesh, 1);
+ st.giveItems(DRAKES_FLESH, 1);
}
break;
case 22613:
if (chance < 440)
{
- st.giveItems(DrakeFlesh, 2);
+ st.giveItems(DRAKES_FLESH, 2);
}
else
{
- st.giveItems(DrakeFlesh, 1);
+ st.giveItems(DRAKES_FLESH, 1);
}
break;
case 25632:
if (chance < 996)
{
- st.giveItems(DrakeFlesh, 1);
+ st.giveItems(DRAKES_FLESH, 1);
}
break;
case 22610:
if (chance < 485)
{
- st.giveItems(DrakeFlesh, 2);
+ st.giveItems(DRAKES_FLESH, 2);
}
else
{
- st.giveItems(DrakeFlesh, 1);
+ st.giveItems(DRAKES_FLESH, 1);
}
break;
case 22611:
if (chance < 451)
{
- st.giveItems(DrakeFlesh, 2);
+ st.giveItems(DRAKES_FLESH, 2);
}
else
{
- st.giveItems(DrakeFlesh, 1);
+ st.giveItems(DRAKES_FLESH, 1);
}
break;
case 25631:
if (chance < 485)
{
- st.giveItems(DrakeFlesh, 2);
+ st.giveItems(DRAKES_FLESH, 2);
}
else
{
- st.giveItems(DrakeFlesh, 1);
+ st.giveItems(DRAKES_FLESH, 1);
}
break;
case 25626:
@@ -393,7 +393,7 @@ public class Q00702_ATrapForRevenge extends Quest
{
count = getRandom(5) + 14;
}
- st.giveItems(VariantDrakeWingHorns, count);
+ st.giveItems(VARIANT_DRAKE_WING_HORNS, count);
break;
}
st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
@@ -403,11 +403,10 @@ public class Q00702_ATrapForRevenge extends Quest
public Q00702_ATrapForRevenge(int questId, String name, String descr)
{
super(questId, name, descr);
- addStartNpc(Plenos);
- addTalkId(Plenos);
- addTalkId(Lekon);
- addTalkId(Tenius);
- addKillId(Monsters);
+ addStartNpc(PLENOS);
+ addTalkId(PLENOS, LEKON, TENIUS);
+ addKillId(MONSTERS);
+ registerQuestItems(DRAKES_FLESH, ROTTEN_BLOOD, BAIT_FOR_DRAKES, VARIANT_DRAKE_WING_HORNS);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
index 9c584e1bc4..bce5af0274 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java
@@ -29,19 +29,16 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
{
// NPC
private static final int ROONEY = 32049;
-
// Monsters
private static final int LAVASAURUS_NEWBORN = 18799;
private static final int LAVASAURUS_FLEDGIING = 18800;
private static final int LAVASAURUS_ADULT = 18801;
private static final int LAVASAURUS_ELDERLY = 18802;
-
// Items
private static final int FRAGMENT_STONE = 21909;
private static final int FRAGMENT_HEAD = 21910;
private static final int FRAGMENT_BODY = 21911;
private static final int FRAGMENT_HORN = 21912;
-
// Rewards
private static final int TOTEM_OF_BODY = 21899;
private static final int TOTEM_OF_SPIRIT = 21900;
@@ -54,7 +51,6 @@ public class Q00901_HowLavasaurusesAreMade extends Quest
addStartNpc(ROONEY);
addTalkId(ROONEY);
addKillId(LAVASAURUS_NEWBORN, LAVASAURUS_FLEDGIING, LAVASAURUS_ADULT, LAVASAURUS_ELDERLY);
-
registerQuestItems(FRAGMENT_STONE, FRAGMENT_HORN, FRAGMENT_HEAD, FRAGMENT_BODY);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
index 03cf14e49a..3a1e1ec874 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java
@@ -31,7 +31,7 @@ public class Q10267_JourneyToGracia extends Quest
private static final int ORVEN = 30857;
private static final int KEUCEREUS = 32548;
private static final int PAPIKU = 32564;
- // Items
+ // Item
private static final int LETTER = 13810;
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
index f618dbdacc..1a308a36c9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java
@@ -30,7 +30,7 @@ public class Q10268_ToTheSeedOfInfinity extends Quest
// NPCs
private static final int KEUCEREUS = 32548;
private static final int TEPIOS = 32603;
- // Items
+ // Item
private static final int INTRODUCTION = 13811;
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
index bd49b95c98..03a2bf510c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java
@@ -30,7 +30,7 @@ public class Q10269_ToTheSeedOfDestruction extends Quest
// NPCs
private static final int KEUCEREUS = 32548;
private static final int ALLENOS = 32526;
- // Items
+ // Item
private static final int INTRODUCTION = 13812;
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
index 26c2e5d78d..edf85398b0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java
@@ -50,7 +50,8 @@ public class Q10272_LightFragment extends Quest
22550, // Savage Warrior
22551, // Priest of Darkness
22552, // Mutation Drake
- 22596 // White Dragon Leader
+ 22596
+ // White Dragon Leader
};
private static final int FRAGMENT_POWDER = 13853;
private static final int LIGHT_FRAGMENT_POWDER = 13854;
@@ -67,8 +68,6 @@ public class Q10272_LightFragment extends Quest
return htmltext;
}
- final int cond = st.getInt("cond");
-
switch (npc.getNpcId())
{
case ORBYU:
@@ -103,7 +102,7 @@ public class Q10272_LightFragment extends Quest
}
else
{
- switch (cond)
+ switch (st.getCond())
{
case 1:
htmltext = "32559-01.html";
@@ -154,7 +153,7 @@ public class Q10272_LightFragment extends Quest
}
case GINBY:
{
- switch (cond)
+ switch (st.getCond())
{
case 1:
case 2:
@@ -177,7 +176,7 @@ public class Q10272_LightFragment extends Quest
}
case LELRIKIA:
{
- switch (cond)
+ switch (st.getCond())
{
case 3:
htmltext = "32567-01.html";
@@ -190,7 +189,7 @@ public class Q10272_LightFragment extends Quest
}
case LEKON:
{
- switch (cond)
+ switch (st.getCond())
{
case 7:
if (st.getInt("wait") == 1)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
index 77379e2197..ec76c87210 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q10273_GoodDayToFly extends Quest
{
- // NPCs
+ // NPC
private static final int LEKON = 32557;
// Monsters
private static final int[] MOBS =
@@ -37,7 +37,7 @@ public class Q10273_GoodDayToFly extends Quest
22615, // Vulture Rider
};
- // Items
+ // Item
private static final int MARK = 13856;
// Skills
private static final SkillHolder AURA_BIRD_FALCON = new SkillHolder(5982, 1);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
index 4325f4f34d..997e14c924 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.model.skills.L2Skill;
*/
public class Q10274_CollectingInTheAir extends Quest
{
- // NPCs
+ // NPC
private static final int LEKON = 32557;
// Items
private static final int SCROLL = 13844;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
index fd8d73589e..dc5acf4b30 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java
@@ -57,8 +57,6 @@ public class Q10275_ContainingTheAttributePower extends Quest
return htmltext;
}
- final int cond = st.getInt("cond");
-
switch (npc.getNpcId())
{
case HOLLY:
@@ -69,7 +67,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
htmltext = (player.getLevel() > 75) ? "30839-01.htm" : "30839-00.html";
break;
case State.STARTED:
- switch (cond)
+ switch (st.getCond())
{
case 1:
htmltext = "30839-03.html";
@@ -93,7 +91,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
htmltext = (player.getLevel() > 75) ? "31307-01.htm" : "31307-00.html";
break;
case State.STARTED:
- switch (cond)
+ switch (st.getCond())
{
case 1:
htmltext = "31307-03.html";
@@ -113,7 +111,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
{
if (st.isStarted())
{
- switch (cond)
+ switch (st.getCond())
{
case 2:
htmltext = "32325-01.html";
@@ -138,7 +136,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
{
if (st.isStarted())
{
- switch (cond)
+ switch (st.getCond())
{
case 7:
htmltext = "32326-01.html";
@@ -241,16 +239,15 @@ public class Q10275_ContainingTheAttributePower extends Quest
return null;
}
- final int cond = st.getInt("cond");
switch (npc.getNpcId())
{
case AIR:
- if (((cond == 8) || (cond == 10)) && (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YANGSWORD) && (st.getQuestItemsCount(SOULPIECEAIR) < 6) && (getRandom(100) < 30))
+ if ((st.isCond(8) || st.isCond(10)) && (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YANGSWORD) && (st.getQuestItemsCount(SOULPIECEAIR) < 6) && (getRandom(100) < 30))
{
st.giveItems(SOULPIECEAIR, 1);
if (st.getQuestItemsCount(SOULPIECEAIR) >= 6)
{
- st.setCond(cond + 1, true);
+ st.setCond(st.getCond() + 1, true);
}
else
{
@@ -259,12 +256,12 @@ public class Q10275_ContainingTheAttributePower extends Quest
}
break;
case WATER:
- if (((cond >= 3) || (cond <= 5)) && (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YINSWORD) && (st.getQuestItemsCount(SOULPIECEWATER) < 6) && (getRandom(100) < 30))
+ if (((st.getCond() >= 3) || (st.getCond() <= 5)) && (st.getItemEquipped(Inventory.PAPERDOLL_RHAND) == YINSWORD) && (st.getQuestItemsCount(SOULPIECEWATER) < 6) && (getRandom(100) < 30))
{
st.giveItems(SOULPIECEWATER, 1);
if (st.getQuestItemsCount(SOULPIECEWATER) >= 6)
{
- st.setCond(cond + 1, true);
+ st.setCond(st.getCond() + 1, true);
}
else
{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
index 2e58d9d537..6818164c2f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java
@@ -30,13 +30,11 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q10279_MutatedKaneusOren extends Quest
{
-
// NPCs
private static final int MOUEN = 30196;
private static final int ROVIA = 30189;
private static final int KAIM_ABIGORE = 18566;
private static final int KNIGHT_MONTAGNAR = 18568;
-
// Items
private static final int TISSUE_KA = 13836;
private static final int TISSUE_KM = 13837;
@@ -164,11 +162,7 @@ public class Q10279_MutatedKaneusOren extends Quest
addStartNpc(MOUEN);
addTalkId(MOUEN, ROVIA);
addKillId(KAIM_ABIGORE, KNIGHT_MONTAGNAR);
- questItemIds = new int[]
- {
- TISSUE_KA,
- TISSUE_KM
- };
+ registerQuestItems(TISSUE_KA, TISSUE_KM);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
index fe118c67d0..5041088bbb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java
@@ -34,7 +34,7 @@ public class Q10281_MutatedKaneusRune extends Quest
private static final int MATHIAS = 31340;
private static final int KAYAN = 31335;
private static final int WHITE_ALLOSCE = 18577;
- // Items
+ // Item
private static final int TISSUE_WA = 13840;
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
index e5e911d395..9296854203 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java
@@ -27,12 +27,10 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q10282_ToTheSeedOfAnnihilation extends Quest
{
-
// NPCs
private static final int KBALDIR = 32733;
private static final int KLEMIS = 32734;
-
- // Items
+ // Item
private static final int SOA_ORDERS = 15512;
@Override
@@ -62,7 +60,7 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
htmltext = (player.getLevel() < 84) ? "32733-00.htm" : "32733-01.htm";
break;
case State.STARTED:
- if (st.getInt("cond") == 1)
+ if (st.isCond(1))
{
if (npcId == KBALDIR)
{
@@ -96,7 +94,6 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
break;
case "32734-02.htm":
st.addExpAndSp(1148480, 99110);
- st.takeItems(SOA_ORDERS, -1);
st.exitQuest(false);
break;
}
@@ -106,9 +103,9 @@ public class Q10282_ToTheSeedOfAnnihilation extends Quest
public Q10282_ToTheSeedOfAnnihilation(int questId, String name, String descr)
{
super(questId, name, descr);
-
addStartNpc(KBALDIR);
addTalkId(KBALDIR, KLEMIS);
+ registerQuestItems(SOA_ORDERS);
}
public static void main(String[] args)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
index b72fc9c1a5..d66c63c5a6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java
@@ -27,18 +27,17 @@ import com.l2jserver.gameserver.model.quest.State;
*/
public class Q10283_RequestOfIceMerchant extends Quest
{
- // NPC's
- private static final int _rafforty = 32020;
- private static final int _kier = 32022;
- private static final int _jinia = 32760;
+ // NPCs
+ private static final int RAFFORTY = 32020;
+ private static final int KIER = 32022;
+ private static final int JINIA = 32760;
public Q10283_RequestOfIceMerchant(int questId, String name, String descr)
{
super(questId, name, descr);
-
- addStartNpc(_rafforty);
- addTalkId(_rafforty, _kier, _jinia);
- addFirstTalkId(_jinia);
+ addStartNpc(RAFFORTY);
+ addTalkId(RAFFORTY, KIER, JINIA);
+ addFirstTalkId(JINIA);
}
@Override
@@ -51,7 +50,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
return htmltext;
}
- if (npc.getNpcId() == _rafforty)
+ if (npc.getNpcId() == RAFFORTY)
{
if (event.equalsIgnoreCase("32020-03.htm"))
{
@@ -62,14 +61,14 @@ public class Q10283_RequestOfIceMerchant extends Quest
st.setCond(2, true);
}
}
- else if ((npc.getNpcId() == _kier) && event.equalsIgnoreCase("spawn"))
+ else if ((npc.getNpcId() == KIER) && event.equalsIgnoreCase("spawn"))
{
- addSpawn(_jinia, 104322, -107669, -3680, 44954, false, 60000);
+ addSpawn(JINIA, 104322, -107669, -3680, 44954, false, 60000);
return null;
}
- else if ((npc.getNpcId() == _jinia) && event.equalsIgnoreCase("32760-04.html"))
+ else if ((npc.getNpcId() == JINIA) && event.equalsIgnoreCase("32760-04.html"))
{
- st.giveItems(57, 190000);
+ st.giveAdena(190000, true);
st.addExpAndSp(627000, 50300);
st.exitQuest(false, true);
npc.deleteMe();
@@ -86,30 +85,22 @@ public class Q10283_RequestOfIceMerchant extends Quest
{
return htmltext;
}
- final int npcId = npc.getNpcId();
- final int cond = st.getInt("cond");
- switch (npcId)
+
+ switch (npc.getNpcId())
{
- case _rafforty:
+ case RAFFORTY:
switch (st.getState())
{
case State.CREATED:
QuestState _prev = player.getQuestState("115_TheOtherSideOfTruth");
- if ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82))
- {
- htmltext = "32020-01.htm";
- }
- else
- {
- htmltext = "32020-00.htm";
- }
+ htmltext = ((_prev != null) && _prev.isCompleted() && (player.getLevel() >= 82)) ? "32020-01.htm" : "32020-00.htm";
break;
case State.STARTED:
- if (cond == 1)
+ if (st.isCond(1))
{
htmltext = "32020-04.htm";
}
- else if (cond == 2)
+ else if (st.isCond(2))
{
htmltext = "32020-08.htm";
}
@@ -119,14 +110,14 @@ public class Q10283_RequestOfIceMerchant extends Quest
break;
}
break;
- case _kier:
- if (cond == 2)
+ case KIER:
+ if (st.isCond(2))
{
htmltext = "32022-01.html";
}
break;
- case _jinia:
- if (cond == 2)
+ case JINIA:
+ if (st.isCond(2))
{
htmltext = "32760-02.html";
}
@@ -144,7 +135,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
}
final QuestState st = player.getQuestState(getName());
- if ((npc.getNpcId() == _jinia) && (st != null) && (st.getInt("cond") == 2))
+ if ((npc.getNpcId() == JINIA) && (st != null) && (st.isCond(2)))
{
return "32760-01.html";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
index 09fda1759b..6dcf9211de 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java
@@ -30,7 +30,7 @@ public class Q10288_SecretMission extends Quest
private static final int DOMINIC = 31350;
private static final int AQUILANI = 32780;
private static final int GREYMORE = 32757;
- // Items
+ // Item
private static final int LETTER = 15529;
@Override
@@ -90,7 +90,6 @@ public class Q10288_SecretMission extends Quest
return htmltext;
}
- final int cond = st.getCond();
switch (npc.getNpcId())
{
case DOMINIC:
@@ -113,11 +112,11 @@ public class Q10288_SecretMission extends Quest
case AQUILANI:
if (st.isStarted())
{
- if ((cond == 1) && st.hasQuestItems(LETTER))
+ if (st.isCond(1) && st.hasQuestItems(LETTER))
{
htmltext = "32780-01.html";
}
- else if (cond == 2)
+ else if (st.isCond(2))
{
htmltext = "32780-04.html";
}
@@ -142,7 +141,6 @@ public class Q10288_SecretMission extends Quest
{
return "32780-05.html";
}
-
return "data/html/default/32780.htm";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
index f7c8e4fda5..b9b4508a66 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java
@@ -33,12 +33,12 @@ import com.l2jserver.gameserver.util.Util;
*/
public class Q10289_FadeToBlack extends Quest
{
- // NPCs
+ // NPC
private static final int GREYMORE = 32757;
// Items
private static final int MARK_OF_SPLENDOR = 15527;
private static final int MARK_OF_DARKNESS = 15528;
- // Monsters
+ // Monster
private static final int ANAYS = 25701;
@Override
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
index 48283a5d74..a8f10b27ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10290_LandDragonConqueror/Q10290_LandDragonConqueror.java
@@ -36,7 +36,8 @@ public class Q10290_LandDragonConqueror extends Quest
29019, // Old
29066, // Weak
29067, // Normal
- 29068 //Strong
+ 29068
+ // Strong
};
// Items
@@ -90,8 +91,7 @@ public class Q10290_LandDragonConqueror extends Quest
}
case State.STARTED:
{
- final int cond = st.getCond();
- if (cond == 1)
+ if (st.isCond(1))
{
if (st.hasQuestItems(SHABBY_NECKLACE))
{
@@ -103,7 +103,7 @@ public class Q10290_LandDragonConqueror extends Quest
htmltext = "30755-07.html";
}
}
- else if ((cond == 2) && st.hasQuestItems(MIRACLE_NECKLACE))
+ else if ((st.isCond(2)) && st.hasQuestItems(MIRACLE_NECKLACE))
{
htmltext = "30755-08.html";
st.giveAdena(131236, true);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
index be3e4f0bd9..a3601bf534 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java
@@ -83,8 +83,7 @@ public class Q10291_FireDragonDestroyer extends Quest
}
case State.STARTED:
{
- final int cond = st.getCond();
- if (cond == 1)
+ if (st.isCond(1))
{
if (st.hasQuestItems(POOR_NECKLACE))
{
@@ -96,7 +95,7 @@ public class Q10291_FireDragonDestroyer extends Quest
htmltext = "31540-07.html";
}
}
- else if ((cond == 2) && st.hasQuestItems(VALOR_NECKLACE))
+ else if (st.isCond(2) && st.hasQuestItems(VALOR_NECKLACE))
{
htmltext = "31540-08.html";
st.giveAdena(126549, true);
@@ -133,7 +132,6 @@ public class Q10291_FireDragonDestroyer extends Quest
{
player.getParty().forEachMember(new RewardCheck(npc));
}
-
return super.onKill(npc, player, isPet);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
index 116cdb7921..5833d9fc2f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java
@@ -286,7 +286,7 @@ public class AirShipGludioGracia extends Quest implements Runnable
// check objects around the ship
for (L2Object obj : L2World.getInstance().getVisibleObjects(_ship, 600))
{
- if (obj instanceof L2Npc)
+ if (obj.isNpc())
{
for (int id : CONTROLLERS)
{
--
GitLab