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

Minor code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-12-11 20:32:47 +00:00
parent 6a2ccc62e4
commit 70f0330eb0
182 changed files with 1006 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java vendored
View File

@@ -219,12 +219,9 @@ public final class Q00016_TheComingDarkness extends Quest
{
htmltext = "31512-01.html";
}
else
else if (qs.isMemoState(1))
{
if (qs.isMemoState(1))
{
htmltext = "31512-04.html";
}
htmltext = "31512-04.html";
}
break;
}
@@ -234,12 +231,9 @@ public final class Q00016_TheComingDarkness extends Quest
{
htmltext = "31513-01.html";
}
else
else if (qs.isMemoState(2))
{
if (qs.isMemoState(2))
{
htmltext = "31513-04.html";
}
htmltext = "31513-04.html";
}
break;
}
@@ -249,12 +243,9 @@ public final class Q00016_TheComingDarkness extends Quest
{
htmltext = "31514-01.html";
}
else
else if (qs.isMemoState(3))
{
if (qs.isMemoState(3))
{
htmltext = "31514-04.html";
}
htmltext = "31514-04.html";
}
break;
}
@@ -264,12 +255,9 @@ public final class Q00016_TheComingDarkness extends Quest
{
htmltext = "31515-01.html";
}
else
else if (qs.isMemoState(4))
{
if (qs.isMemoState(4))
{
htmltext = "31515-04.html";
}
htmltext = "31515-04.html";
}
break;
}
@@ -279,12 +267,9 @@ public final class Q00016_TheComingDarkness extends Quest
{
htmltext = "31516-01.html";
}
else
else if (qs.isMemoState(5))
{
if (qs.isMemoState(5))
{
htmltext = "31516-04.html";
}
htmltext = "31516-04.html";
}
break;
}

28
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java vendored
View File

@@ -204,12 +204,9 @@ public final class Q00017_LightAndDarkness extends Quest
{
htmltext = "31508-01.html";
}
else
else if (qs.isMemoState(1))
{
if (qs.isMemoState(1))
{
htmltext = "31508-04.html";
}
htmltext = "31508-04.html";
}
break;
}
@@ -219,12 +216,9 @@ public final class Q00017_LightAndDarkness extends Quest
{
htmltext = "31509-01.html";
}
else
else if (qs.isMemoState(2))
{
if (qs.isMemoState(2))
{
htmltext = "31509-04.html";
}
htmltext = "31509-04.html";
}
break;
}
@@ -234,12 +228,9 @@ public final class Q00017_LightAndDarkness extends Quest
{
htmltext = "31510-01.html";
}
else
else if (qs.isMemoState(3))
{
if (qs.isMemoState(3))
{
htmltext = "31510-04.html";
}
htmltext = "31510-04.html";
}
break;
}
@@ -249,12 +240,9 @@ public final class Q00017_LightAndDarkness extends Quest
{
htmltext = "31511-01.html";
}
else
else if (qs.isMemoState(4))
{
if (qs.isMemoState(4))
{
htmltext = "31511-04.html";
}
htmltext = "31511-04.html";
}
break;
}

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

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

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

@@ -233,7 +233,7 @@ public final class Q00193_SevenSignsDyingMessage extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{

2
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00194_SevenSignsMammonsContract/Q00194_SevenSignsMammonsContract.java vendored
View File

@@ -347,7 +347,7 @@ public final class Q00194_SevenSignsMammonsContract extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{

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

@@ -223,7 +223,7 @@ public final class Q00195_SevenSignsSecretRitualOfThePriests extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{

2
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00196_SevenSignsSealOfTheEmperor/Q00196_SevenSignsSealOfTheEmperor.java vendored
View File

@@ -234,7 +234,7 @@ public final class Q00196_SevenSignsSealOfTheEmperor extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{

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

@@ -247,7 +247,7 @@ public final class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{

2
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java vendored
View File

@@ -197,7 +197,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (st.getState())
{

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

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

25
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00474_WaitingForTheSummer/Q00474_WaitingForTheSummer.java vendored
View File

@@ -109,25 +109,22 @@ public final class Q00474_WaitingForTheSummer extends Quest
break;
}
}
else
else if (qs.isStarted() && qs.isCond(2))
{
if (qs.isStarted() && qs.isCond(2))
if (!isSimulated)
{
if (!isSimulated)
giveAdena(player, 194000, true);
if (player.getLevel() >= MIN_LEVEL)
{
giveAdena(player, 194000, true);
if (player.getLevel() >= MIN_LEVEL)
{
addExpAndSp(player, 1879400, 451);
}
qs.exitQuest(QuestType.DAILY, true);
addExpAndSp(player, 1879400, 451);
}
htmltext = "31981-01.html";
}
else if (qs.isCompleted() && !qs.isNowAvailable())
{
htmltext = "31981-02.html";
qs.exitQuest(QuestType.DAILY, true);
}
htmltext = "31981-01.html";
}
else if (qs.isCompleted() && !qs.isNowAvailable())
{
htmltext = "31981-02.html";
}
return htmltext;
}

11
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00476_PlainMission/Q00476_PlainMission.java vendored
View File

@@ -210,14 +210,11 @@ public final class Q00476_PlainMission extends Quest
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
else
else if (killedGrendel < 45)
{
if (killedGrendel < 45)
{
killedGrendel++;
st.set("killed_" + GRENDEL[0], killedGrendel);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
killedGrendel++;
st.set("killed_" + GRENDEL[0], killedGrendel);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if ((killedAntelope == 45) && (killedBandersnatch == 45) && (killedBuffalo == 45) && (killedGrendel == 45))

213
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00620_FourGoblets/Q00620_FourGoblets.java vendored
View File

@@ -30,16 +30,16 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
public class Q00620_FourGoblets extends Quest
{
// NPCs
private final static int NAMELESS_SPIRIT = 31453;
private final static int GHOST_OF_WIGOTH_1 = 31452;
private final static int GHOST_OF_WIGOTH_2 = 31454;
private final static int CONQ_SM = 31921;
private final static int EMPER_SM = 31922;
private final static int SAGES_SM = 31923;
private final static int JUDGE_SM = 31924;
private final static int GHOST_CHAMBERLAIN_1 = 31919;
private final static int GHOST_CHAMBERLAIN_2 = 31920;
private final static int[] NPCS =
private static final int NAMELESS_SPIRIT = 31453;
private static final int GHOST_OF_WIGOTH_1 = 31452;
private static final int GHOST_OF_WIGOTH_2 = 31454;
private static final int CONQ_SM = 31921;
private static final int EMPER_SM = 31922;
private static final int SAGES_SM = 31923;
private static final int JUDGE_SM = 31924;
private static final int GHOST_CHAMBERLAIN_1 = 31919;
private static final int GHOST_CHAMBERLAIN_2 = 31920;
private static final int[] NPCS =
{
NAMELESS_SPIRIT,
GHOST_OF_WIGOTH_1,
@@ -53,25 +53,25 @@ public class Q00620_FourGoblets extends Quest
};
// Reward
private final static int ANTIQUE_BROOCH = 7262;
private static final int ANTIQUE_BROOCH = 7262;
// Items
private final static int ENTRANCE_PASS = 7075;
private final static int GRAVE_PASS = 7261;
private final static int[] GOBLETS =
private static final int ENTRANCE_PASS = 7075;
private static final int GRAVE_PASS = 7261;
private static final int[] GOBLETS =
{
7256,
7257,
7258,
7259
};
private final static int BOSS_1 = 25339;
private final static int BOSS_2 = 25342;
private final static int BOSS_3 = 25346;
private final static int BOSS_4 = 25349;
private static final int BOSS_1 = 25339;
private static final int BOSS_2 = 25342;
private static final int BOSS_3 = 25346;
private static final int BOSS_4 = 25349;
private final static int RELIC = 7254;
private final static int SEALED_BOX = 7255;
private final static int[] QI =
private static final int RELIC = 7254;
private static final int SEALED_BOX = 7255;
private static final int[] QI =
{
ANTIQUE_BROOCH,
SEALED_BOX,
@@ -112,7 +112,7 @@ public class Q00620_FourGoblets extends Quest
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = event;
QuestState st = player.getQuestState(getName());
final QuestState st = player.getQuestState(getName());
if (st == null)
{
return htmltext;
@@ -141,7 +141,7 @@ public class Q00620_FourGoblets extends Quest
htmltext = "31454-13.htm";
takeItems(player, SEALED_BOX, 1);
int reward = 0;
int rnd = Rnd.get(5);
final int rnd = Rnd.get(5);
if (rnd == 0)
{
giveItems(player, 57, 10000);
@@ -152,7 +152,7 @@ public class Q00620_FourGoblets extends Quest
if (Rnd.get(1000) < 848)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 43)
{
giveItems(player, 1884, 42);
@@ -197,7 +197,7 @@ public class Q00620_FourGoblets extends Quest
else if (Rnd.get(1000) < 323)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 335)
{
giveItems(player, 1888, 1);
@@ -233,7 +233,7 @@ public class Q00620_FourGoblets extends Quest
if (Rnd.get(1000) < 847)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 148)
{
giveItems(player, 1878, 8);
@@ -278,7 +278,7 @@ public class Q00620_FourGoblets extends Quest
else if (Rnd.get(1000) < 251)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 350)
{
giveItems(player, 1887, 1);
@@ -314,7 +314,7 @@ public class Q00620_FourGoblets extends Quest
if (Rnd.get(1000) < 31)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 223)
{
giveItems(player, 730, 1);
@@ -331,7 +331,7 @@ public class Q00620_FourGoblets extends Quest
else if (Rnd.get(1000) < 50)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 202)
{
giveItems(player, 729, 1);
@@ -351,7 +351,7 @@ public class Q00620_FourGoblets extends Quest
if (Rnd.get(1000) < 329)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 88)
{
giveItems(player, 6698, 1);
@@ -424,7 +424,7 @@ public class Q00620_FourGoblets extends Quest
else if (Rnd.get(1000) < 54)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 100)
{
giveItems(player, 6688, 1);
@@ -524,18 +524,15 @@ public class Q00620_FourGoblets extends Quest
st.getPlayer().teleToLocation(178298, -84574, -7216);
htmltext = null;
}
else if (getQuestItemsCount(player, GRAVE_PASS) >= 1)
{
takeItems(player, GRAVE_PASS, 1);
st.getPlayer().teleToLocation(178298, -84574, -7216);
htmltext = null;
}
else
{
if (getQuestItemsCount(player, GRAVE_PASS) >= 1)
{
takeItems(player, GRAVE_PASS, 1);
st.getPlayer().teleToLocation(178298, -84574, -7216);
htmltext = null;
}
else
{
htmltext = "31919-0.htm";
}
htmltext = "31919-0.htm";
}
break;
}
@@ -546,18 +543,15 @@ public class Q00620_FourGoblets extends Quest
st.getPlayer().teleToLocation(186942, -75602, -2834);
htmltext = null;
}
else if (getQuestItemsCount(player, GRAVE_PASS) >= 1)
{
takeItems(player, GRAVE_PASS, 1);
st.getPlayer().teleToLocation(186942, -75602, -2834);
htmltext = null;
}
else
{
if (getQuestItemsCount(player, GRAVE_PASS) >= 1)
{
takeItems(player, GRAVE_PASS, 1);
st.getPlayer().teleToLocation(186942, -75602, -2834);
htmltext = null;
}
else
{
htmltext = "31920-0.htm";
}
htmltext = "31920-0.htm";
}
break;
}
@@ -596,7 +590,7 @@ public class Q00620_FourGoblets extends Quest
htmltext = "31919-3.htm";
takeItems(player, SEALED_BOX, 1);
int reward = 0;
int rnd = Rnd.get(5);
final int rnd = Rnd.get(5);
if (rnd == 0)
{
giveItems(player, 57, 10000);
@@ -607,7 +601,7 @@ public class Q00620_FourGoblets extends Quest
if (Rnd.get(1000) < 848)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 43)
{
giveItems(player, 1884, 42);
@@ -652,7 +646,7 @@ public class Q00620_FourGoblets extends Quest
else if (Rnd.get(1000) < 323)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 335)
{
giveItems(player, 1888, 1);
@@ -688,7 +682,7 @@ public class Q00620_FourGoblets extends Quest
if (Rnd.get(1000) < 847)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 148)
{
giveItems(player, 1878, 8);
@@ -733,7 +727,7 @@ public class Q00620_FourGoblets extends Quest
else if (Rnd.get(1000) < 251)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 350)
{
giveItems(player, 1887, 1);
@@ -769,7 +763,7 @@ public class Q00620_FourGoblets extends Quest
if (Rnd.get(1000) < 31)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 223)
{
giveItems(player, 730, 1);
@@ -787,7 +781,7 @@ public class Q00620_FourGoblets extends Quest
{
reward = 1;
}
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 202)
{
giveItems(player, 729, 1);
@@ -806,7 +800,7 @@ public class Q00620_FourGoblets extends Quest
if (Rnd.get(1000) < 329)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 88)
{
giveItems(player, 6698, 1);
@@ -879,7 +873,7 @@ public class Q00620_FourGoblets extends Quest
else if (Rnd.get(1000) < 54)
{
reward = 1;
int i = Rnd.get(1000);
final int i = Rnd.get(1000);
if (i < 100)
{
giveItems(player, 6688, 1);
@@ -1076,75 +1070,54 @@ public class Q00620_FourGoblets extends Quest
{
htmltext = "31454-4.htm";
}
else if ((getQuestItemsCount(talker, GOBLETS[0]) + getQuestItemsCount(talker, GOBLETS[1]) + getQuestItemsCount(talker, GOBLETS[2]) + getQuestItemsCount(talker, GOBLETS[3])) > 1)
{
htmltext = "31454-8.htm";
}
else
{
if ((getQuestItemsCount(talker, GOBLETS[0]) + getQuestItemsCount(talker, GOBLETS[1]) + getQuestItemsCount(talker, GOBLETS[2]) + getQuestItemsCount(talker, GOBLETS[3])) > 1)
{
htmltext = "31454-8.htm";
}
else
{
htmltext = "31454-12.htm";
}
htmltext = "31454-12.htm";
}
}
else if ((getQuestItemsCount(talker, GOBLETS[0]) >= 1) && (getQuestItemsCount(talker, GOBLETS[1]) >= 1) && (getQuestItemsCount(talker, GOBLETS[2]) >= 1) && ((getQuestItemsCount(talker, GOBLETS[3])) >= 1))
{
htmltext = "31454-3.htm";
}
else if ((getQuestItemsCount(talker, GOBLETS[0]) + getQuestItemsCount(talker, GOBLETS[1]) + getQuestItemsCount(talker, GOBLETS[2]) + getQuestItemsCount(talker, GOBLETS[3])) > 1)
{
htmltext = "31454-7.htm";
}
else
{
if ((getQuestItemsCount(talker, GOBLETS[0]) >= 1) && (getQuestItemsCount(talker, GOBLETS[1]) >= 1) && (getQuestItemsCount(talker, GOBLETS[2]) >= 1) && ((getQuestItemsCount(talker, GOBLETS[3])) >= 1))
{
htmltext = "31454-3.htm";
}
else
{
if ((getQuestItemsCount(talker, GOBLETS[0]) + getQuestItemsCount(talker, GOBLETS[1]) + getQuestItemsCount(talker, GOBLETS[2]) + getQuestItemsCount(talker, GOBLETS[3])) > 1)
{
htmltext = "31454-7.htm";
}
else
{
htmltext = "31454-11.htm";
}
}
htmltext = "31454-11.htm";
}
}
else if (getQuestItemsCount(talker, SEALED_BOX) >= 1)
{
if ((getQuestItemsCount(talker, GOBLETS[0]) >= 1) && (getQuestItemsCount(talker, GOBLETS[1]) >= 1) && (getQuestItemsCount(talker, GOBLETS[2]) >= 1) && (getQuestItemsCount(talker, GOBLETS[3]) >= 1))
{
htmltext = "31454-2.htm";
}
else if ((getQuestItemsCount(talker, GOBLETS[0]) + getQuestItemsCount(talker, GOBLETS[1]) + getQuestItemsCount(talker, GOBLETS[2]) + getQuestItemsCount(talker, GOBLETS[3])) > 1)
{
htmltext = "31454-6.htm";
}
else
{
htmltext = "31454-10.htm";
}
}
else if ((getQuestItemsCount(talker, GOBLETS[0]) >= 1) && (getQuestItemsCount(talker, GOBLETS[1]) >= 1) && (getQuestItemsCount(talker, GOBLETS[2]) >= 1) && (getQuestItemsCount(talker, GOBLETS[3]) >= 1))
{
htmltext = "31454-1.htm";
}
else if ((getQuestItemsCount(talker, GOBLETS[0]) + getQuestItemsCount(talker, GOBLETS[1]) + getQuestItemsCount(talker, GOBLETS[2]) + getQuestItemsCount(talker, GOBLETS[3])) > 1)
{
htmltext = "31454-5.htm";
}
else
{
if (getQuestItemsCount(talker, SEALED_BOX) >= 1)
{
if ((getQuestItemsCount(talker, GOBLETS[0]) >= 1) && (getQuestItemsCount(talker, GOBLETS[1]) >= 1) && (getQuestItemsCount(talker, GOBLETS[2]) >= 1) && (getQuestItemsCount(talker, GOBLETS[3]) >= 1))
{
htmltext = "31454-2.htm";
}
else
{
if ((getQuestItemsCount(talker, GOBLETS[0]) + getQuestItemsCount(talker, GOBLETS[1]) + getQuestItemsCount(talker, GOBLETS[2]) + getQuestItemsCount(talker, GOBLETS[3])) > 1)
{
htmltext = "31454-6.htm";
}
else
{
htmltext = "31454-10.htm";
}
}
}
else
{
if ((getQuestItemsCount(talker, GOBLETS[0]) >= 1) && (getQuestItemsCount(talker, GOBLETS[1]) >= 1) && (getQuestItemsCount(talker, GOBLETS[2]) >= 1) && (getQuestItemsCount(talker, GOBLETS[3]) >= 1))
{
htmltext = "31454-1.htm";
}
else
{
if ((getQuestItemsCount(talker, GOBLETS[0]) + getQuestItemsCount(talker, GOBLETS[1]) + getQuestItemsCount(talker, GOBLETS[2]) + getQuestItemsCount(talker, GOBLETS[3])) > 1)
{
htmltext = "31454-5.htm";
}
else
{
htmltext = "31454-9.htm";
}
}
}
htmltext = "31454-9.htm";
}
break;
}
@@ -1182,7 +1155,7 @@ public class Q00620_FourGoblets extends Quest
{
final QuestState st = killer.getQuestState(getName());
final L2PcInstance partyMember = getRandomPartyMember(killer, 3);
int npcId = npc.getId();
final int npcId = npc.getId();
if ((st != null) && (st.getCond() > 0) && (npcId >= 18120) && (npcId <= 18256))
{
if (Rnd.get(100) < 15)

21
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java vendored
View File

@@ -296,7 +296,7 @@ public class Q00663_SeductiveWhispers extends Quest
boolean isPlayerWin = false;
boolean isNpcWin = false;
String htmltext;
String table = getHtm(player.getHtmlPrefix(), "table.html");
final String table = getHtm(player.getHtmlPrefix(), "table.html");
if (isPlayerTurn)
{
@@ -330,19 +330,16 @@ public class Q00663_SeductiveWhispers extends Quest
htmltext = htmltext.replace("%table%", table);
}
}
else if ((playerCard != null) && (npcCard != null) && isWinner(playerCard, npcCard, false))
{
htmltext = getHtm(player.getHtmlPrefix(), isPractice ? "30846-24.html" : "30846-21.html");
htmltext = htmltext.replace("%table%", table);
isNpcWin = true;
}
else
{
if ((playerCard != null) && (npcCard != null) && isWinner(playerCard, npcCard, false))
{
htmltext = getHtm(player.getHtmlPrefix(), isPractice ? "30846-24.html" : "30846-21.html");
htmltext = htmltext.replace("%table%", table);
isNpcWin = true;
}
else
{
htmltext = getHtm(player.getHtmlPrefix(), isPractice ? "30846-23.html" : "30846-17.html");
htmltext = htmltext.replace("%table%", table);
}
htmltext = getHtm(player.getHtmlPrefix(), isPractice ? "30846-23.html" : "30846-17.html");
htmltext = htmltext.replace("%table%", table);
}
htmltext = htmltext.replaceAll("%player_name%", player.getName());

7
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00772_PurifyingSouls/Q00772_PurifyingSouls.java vendored
View File

@@ -157,12 +157,9 @@ public class Q00772_PurifyingSouls extends Quest
}
}
}
else
else if (qs.isCompleted() && !qs.isNowAvailable())
{
if (qs.isCompleted() && !qs.isNowAvailable())
{
htmltext = "33838-10.htm";
}
htmltext = "33838-10.htm";
}
return htmltext;
}

7
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00784_TheQuietKiller/Q00784_TheQuietKiller.java vendored
View File

@@ -232,12 +232,9 @@ public class Q00784_TheQuietKiller extends Quest
}
}
}
else
else if (qs.isCompleted() && !qs.isNowAvailable())
{
if (qs.isCompleted() && !qs.isNowAvailable())
{
htmltext = "31554-10.html";
}
htmltext = "31554-10.html";
}
return htmltext;
}

2
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java vendored
View File

@@ -119,7 +119,7 @@ public class Q10275_ContainingTheAttributePower extends Quest
if (Util.isDigit(event))
{
htmltext = Integer.toString(npc.getId()) + "-1" + event + ".html";
htmltext = npc.getId() + "-1" + event + ".html";
giveItems(player, 10520 + CommonUtil.constrain(Integer.parseInt(event), 0, 6), 2);
addExpAndSp(player, 202160, 20375);
st.exitQuest(false, true);

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

@@ -229,7 +229,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState st = getQuestState(player, true);
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (npc.getId())
{

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

@@ -220,7 +220,7 @@ public final class Q10293_SevenSignsForbiddenBookOfTheElmoreAdenKingdom extends
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState qs = getQuestState(player, true);
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (npc.getId())
{

2
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java vendored
View File

@@ -303,7 +303,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
QuestState qs = getQuestState(player, true);
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
switch (npc.getId())
{

4
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10295_SevenSignsSolinasTomb/Q10295_SevenSignsSolinasTomb.java vendored
View File

@@ -53,7 +53,7 @@ public final class Q10295_SevenSignsSolinasTomb extends Quest
return null;
}
String htmltext = null;
final String htmltext = null;
switch (event)
{
@@ -65,7 +65,7 @@ public final class Q10295_SevenSignsSolinasTomb extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
// QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
final String htmltext = getNoQuestMsg(player);
switch (npc.getId())
{

4
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal/Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal.java vendored
View File

@@ -53,7 +53,7 @@ public final class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
return null;
}
String htmltext = null;
final String htmltext = null;
switch (event)
{
@@ -65,7 +65,7 @@ public final class Q10296_SevenSignsOneWhoSeeksThePowerOfTheSeal extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
// QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
final String htmltext = getNoQuestMsg(player);
switch (npc.getId())
{

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

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

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

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

11
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10358_DividedSakumPoslof/Q10358_DividedSakumPoslof.java vendored
View File

@@ -179,14 +179,11 @@ public final class Q10358_DividedSakumPoslof extends Quest
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
else
else if (killedVeelans < 23)
{
if (killedVeelans < 23)
{
killedVeelans++;
st.set("killed_" + VEELEAN, killedVeelans);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
killedVeelans++;
st.set("killed_" + VEELEAN, killedVeelans);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if ((killedZombies == 20) && (killedVeelans == 23))

4
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java vendored
View File

@@ -46,7 +46,7 @@ public final class Q10365_SeekerEscort extends Quest
// Locations
private static final Location BLOODHOUND_SPAWN_1 = new Location(-110624, 238369, -2920);
private static final Location BLOODHOUND_SPAWN_2 = new Location(-112660, 233942, -3072);
private final static Location[] BLOODHOUND_LOC_1 =
private static final Location[] BLOODHOUND_LOC_1 =
{
new Location(-110574, 238972, -2920),
new Location(-110723, 239275, -2920),
@@ -68,7 +68,7 @@ public final class Q10365_SeekerEscort extends Quest
new Location(-112199, 240141, -2920),
new Location(-112291, 240201, -2920),
};
private final static Location[] BLOODHOUND_LOC_2 =
private static final Location[] BLOODHOUND_LOC_2 =
{
new Location(-112403, 233676, -3096),
new Location(-112174, 233487, -3120),

37
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10420_TheVarkaSilenosSupporters/Q10420_TheVarkaSilenosSupporters.java vendored
View File

@@ -166,13 +166,10 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
else
else if (wizardCount < 50)
{
if (wizardCount < 50)
{
st.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
st.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if ((shooterCount >= 50) && (wizardCount >= 50))
@@ -180,27 +177,21 @@ public final class Q10420_TheVarkaSilenosSupporters extends Quest
st.setCond(2, true);
}
}
else
else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
{
if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
if (st.getInt("KillCount_" + EMBRYO_WIZARD) < 50)
{
if (st.getInt("KillCount_" + EMBRYO_WIZARD) < 50)
{
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
}
}
else
{
if (st.getInt("KillCount_" + EMBRYO_SHOOTER) < 50)
{
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
}
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
}
}
else if (st.getInt("KillCount_" + EMBRYO_SHOOTER) < 50)
{
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
}
}
return super.onKill(npc, killer, isSummon);
}

37
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10425_TheKetraOrcSupporters/Q10425_TheKetraOrcSupporters.java vendored
View File

@@ -169,13 +169,10 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
}
else
else if (wizardCount < 50)
{
if (wizardCount < 50)
{
qs.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
qs.set("KillCount_" + EMBRYO_WIZARD, ++wizardCount);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
}
if ((shooterCount >= 50) && (wizardCount >= 50))
@@ -183,27 +180,21 @@ public final class Q10425_TheKetraOrcSupporters extends Quest
qs.setCond(2, true);
}
}
else
else if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
{
if (CommonUtil.contains(WIZARD_MONSTERS, npc.getId()))
if (qs.getInt("KillCount_" + EMBRYO_WIZARD) < 50)
{
if (qs.getInt("KillCount_" + EMBRYO_WIZARD) < 50)
{
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
}
}
else
{
if (qs.getInt("KillCount_" + EMBRYO_SHOOTER) < 50)
{
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
}
final L2Npc embryo = addSpawn(EMBRYO_WIZARD, npc, false, 60000);
addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
}
}
else if (qs.getInt("KillCount_" + EMBRYO_SHOOTER) < 50)
{
final L2Npc embryo = addSpawn(EMBRYO_SHOOTER, npc, false, 60000);
addAttackPlayerDesire(embryo, killer);
embryo.broadcastSay(ChatType.NPC_GENERAL, NpcStringId.YOU_DARE_INTERFERE_WITH_EMBRYO_SURELY_YOU_WISH_FOR_DEATH);
}
}
return super.onKill(npc, killer, isSummon);
}

4
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10436_KekropusLetterTheSealOfPunishment/Q10436_KekropusLetterTheSealOfPunishment.java vendored
View File

@@ -16,8 +16,6 @@
*/
package quests.Q10436_KekropusLetterTheSealOfPunishment;
import quests.LetterQuest;
import com.l2jmobius.gameserver.enums.CategoryType;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -27,6 +25,8 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import quests.LetterQuest;
/**
* Kekropus' Letter: The Seal of Punishment (10436)
* @author Stayway

4
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10440_TheSealOfPunishmentTheFields/Q10440_TheSealOfPunishmentTheFields.java vendored
View File

@@ -107,7 +107,7 @@ public class Q10440_TheSealOfPunishmentTheFields extends Quest
final int stoneId = Integer.parseInt(event.replaceAll("reward_", ""));
giveItems(player, stoneId, 15);
giveStoryQuestReward(player, 60);
int count = qs.getInt(KILL_COUNT_VAR);
final int count = qs.getInt(KILL_COUNT_VAR);
if ((count >= 50) && (count < 100))
{
addExpAndSp(player, 28240800, 6777);
@@ -226,7 +226,7 @@ public class Q10440_TheSealOfPunishmentTheFields extends Quest
final QuestState qs = getQuestState(killer, false);
if ((qs != null) && (qs.getCond() > 0))
{
int count = qs.getInt(KILL_COUNT_VAR) + 1;
final int count = qs.getInt(KILL_COUNT_VAR) + 1;
qs.set(KILL_COUNT_VAR, count);
if ((count >= 50) && (qs.isMemoState(1)))
{

2
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10734_DoOrDie/Q10734_DoOrDie.java vendored
View File

@@ -41,7 +41,7 @@ public final class Q10734_DoOrDie extends Quest
private static final int ADVENTURER_S_GUIDE_APPRENTICE = 33950;
private static final int TRAINING_DUMMY = 19546;
// Skills
private final static SkillHolder[] COMMON_BUFFS =
private static final SkillHolder[] COMMON_BUFFS =
{
new SkillHolder(5182, 1), // Blessing of Protection
new SkillHolder(15642, 1), // Horn Melody

34
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java vendored
View File

@@ -96,26 +96,22 @@ public final class Q10742_AFurryFriend extends Quest
showOnScreenMsg(player, NpcStringId.RICKY_IS_NOT_HERE_NTRY_SEARCHING_ANOTHER_KIKU_S_CAVE, ExShowScreenMessage.TOP_CENTER, 8000);
htmltext = "33995-02.html";
}
else
else if (!L2World.getInstance().getVisibleObjects(player, L2Npc.class, 500).stream().anyMatch(n -> (n.getId() == RICKY) && (n.getSummoner() == player)))
{
// Check if player has Ricky spawned
if (!L2World.getInstance().getVisibleObjects(player, L2Npc.class, 500).stream().anyMatch(n -> (n.getId() == RICKY) && (n.getSummoner() == player)))
{
showOnScreenMsg(player, NpcStringId.TAKE_RICKY_TO_LEIRA_IN_UNDER_2_MINUTES, ExShowScreenMessage.MIDDLE_CENTER, 5000);
player.sendPacket(new ExSendUIEvent(player, false, false, 120, 0, NpcStringId.REMAINING_TIME));
// Spawn Ricky
final L2Npc ricky = addSpawn(RICKY, player, true, 120000);
ricky.setSummoner(player);
ricky.setTitle(player.getAppearance().getVisibleName());
ricky.setIsRunning(true);
ricky.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
startQuestTimer("CHECK_RICKY_DISTANCE", 2500, ricky, player);
}
else // Already have Ricky
{
htmltext = "33995-03.html";
}
showOnScreenMsg(player, NpcStringId.TAKE_RICKY_TO_LEIRA_IN_UNDER_2_MINUTES, ExShowScreenMessage.MIDDLE_CENTER, 5000);
player.sendPacket(new ExSendUIEvent(player, false, false, 120, 0, NpcStringId.REMAINING_TIME));
// Spawn Ricky
final L2Npc ricky = addSpawn(RICKY, player, true, 120000);
ricky.setSummoner(player);
ricky.setTitle(player.getAppearance().getVisibleName());
ricky.setIsRunning(true);
ricky.getAI().setIntention(CtrlIntention.AI_INTENTION_FOLLOW, player);
startQuestTimer("CHECK_RICKY_DISTANCE", 2500, ricky, player);
}
else // Already have Ricky
{
htmltext = "33995-03.html";
}
}
break;

9
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10757_QuietingTheStorm/Q10757_QuietingTheStorm.java vendored
View File

@@ -134,13 +134,10 @@ public final class Q10757_QuietingTheStorm extends Quest
sendNpcLogList(killer);
}
}
else
else if (windimaCount != 1)
{
if (windimaCount != 1)
{
qs.set(WINDIMA_COUNT_VAR, ++windimaCount);
sendNpcLogList(killer);
}
qs.set(WINDIMA_COUNT_VAR, ++windimaCount);
sendNpcLogList(killer);
}
if ((vortexCount >= 5) && (windimaCount >= 1))

33
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10764_FreeSpirit/Q10764_FreeSpirit.java vendored
View File

@@ -120,26 +120,23 @@ public final class Q10764_FreeSpirit extends Quest
break;
}
}
else if (qs.isStarted() && qs.isCond(1))
{
final int npcId = (npc.getId() == WIND_SPIRIT) ? LIBERATED_WIND_SPIRIT : LIBERATED_TREE_SPIRIT;
giveItems(player, LOOSENED_CHAIN, 1);
addSpawn(npcId, npc, false, 2500);
npc.deleteMe();
if (getQuestItemsCount(player, LOOSENED_CHAIN) >= 10)
{
qs.setCond(2, true);
}
htmltext = null;
}
else
{
if (qs.isStarted() && qs.isCond(1))
{
final int npcId = (npc.getId() == WIND_SPIRIT) ? LIBERATED_WIND_SPIRIT : LIBERATED_TREE_SPIRIT;
giveItems(player, LOOSENED_CHAIN, 1);
addSpawn(npcId, npc, false, 2500);
npc.deleteMe();
if (getQuestItemsCount(player, LOOSENED_CHAIN) >= 10)
{
qs.setCond(2, true);
}
htmltext = null;
}
else
{
htmltext = npc.getId() + "-01.html";
}
htmltext = npc.getId() + "-01.html";
}
return htmltext;
}

2
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10794_InvestigateTheForest/Q10794_InvestigateTheForest.java vendored
View File

@@ -195,7 +195,7 @@ public final class Q10794_InvestigateTheForest extends Quest
final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isCond(1))
{
int count = qs.getInt(KILL_COUNT_VAR) + 1;
final int count = qs.getInt(KILL_COUNT_VAR) + 1;
qs.set(KILL_COUNT_VAR, count);
if (count >= 50)
{