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

Quest condition is now cached in a separate QuestState variable.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-13 15:21:57 +00:00
parent 2988292540
commit e9f27b365e
700 changed files with 35311 additions and 33501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java vendored
View File

@@ -567,7 +567,7 @@ public class HallOfErosionAttack extends AbstractNpcAI
if (plr != null)
{
final QuestState qs = plr.getQuestState(Q00696_ConquerTheHallOfErosion.class.getSimpleName());
if ((qs != null) && (qs.getInt("cond") == 1))
if ((qs != null) && qs.isCond(1))
{
qs.set("cohemenes", "1");
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java vendored
View File

@@ -620,7 +620,7 @@ public class HallOfErosionDefence extends AbstractNpcAI
if (player != null)
{
final QuestState qs = player.getQuestState(Q00697_DefendTheHallOfErosion.class.getSimpleName());
if ((qs != null) && (qs.getInt("cond") == 1))
if ((qs != null) && qs.isCond(1))
{
qs.set("defenceDone", 1);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java vendored
View File

@@ -674,7 +674,7 @@ public class HeartInfinityDefence extends AbstractNpcAI
for (PlayerInstance player : _world.getAllowed())
{
final QuestState qs = player.getQuestState(Q00697_DefendTheHallOfErosion.class.getSimpleName());
if ((qs != null) && (qs.getInt("cond") == 1))
if ((qs != null) && qs.isCond(1))
{
qs.set("defenceDone", 1);
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java vendored
View File

@@ -334,7 +334,7 @@ public class AdminShowQuests implements IAdminCommandHandler
{
qs = QuestManager.getInstance().getQuest(Integer.parseInt(val[0])).newQuestState(target);
qs.setState(State.STARTED);
qs.set("cond", "1");
qs.setCond(1);
target.sendPacket(new QuestList(target));
target.sendPacket(new ExShowQuestMark(qs.getQuest().getId()));
val[0] = qs.getQuest().getName();

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java vendored
View File

@@ -111,7 +111,7 @@ public class Q00012_SecretMeetingWithVarkaSilenos extends Quest
}
case State.STARTED:
{
final int cond = qs.getInt("cond");
final int cond = qs.getCond();
if ((npcId == CADMON) && (cond == 1))
{
htmltext = "31296-04.html";

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java vendored
View File

@@ -104,7 +104,7 @@ public class Q00182_NewRecruits extends Quest
}
case State.STARTED:
{
if (qs.getInt("cond") == 1)
if (qs.isCond(1))
{
htmltext = "32138-04.html";
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java vendored
View File

@@ -219,7 +219,7 @@ public class Q00311_ExpulsionOfEvilSpirits extends Quest
final PlayerInstance member = qs.getPlayer();
if (npc.getId() == VARANGKA)
{
if ((qs.getInt("cond") != 1))
if (!qs.isCond(1))
{
return null;
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java vendored
View File

@@ -219,10 +219,6 @@ public class Q00350_EnhanceYourWeapon extends Quest
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs.getState() == State.CREATED)
{
qs.set("cond", "0");
}
if (qs.getInt("cond") == 0)
{
htmltext = npc.getId() + "-01.htm";
}

12
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java vendored
View File

@@ -209,7 +209,7 @@ public class Q00511_AwlUnderFoot extends Quest
for (PlayerInstance partyMember : party.getMembers())
{
final QuestState qs = getQuestState(partyMember, false);
if ((qs == null) || (qs.getInt("cond") < 1))
if ((qs == null) || (qs.getCond() < 1))
{
return getHtm(player, "FortressWarden-05.htm").replace("%player%", partyMember.getName());
}
@@ -418,15 +418,7 @@ public class Q00511_AwlUnderFoot extends Quest
else if (qs != null)
{
final int npcId = npc.getId();
int cond = 0;
if (qs.getState() == State.CREATED)
{
qs.set("cond", "0");
}
else
{
cond = qs.getInt("cond");
}
final int cond = qs.getCond();
if (_fortDungeons.containsKey(npcId) && (cond == 0))
{
if (player.getLevel() >= 60)

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java vendored
View File

@@ -57,9 +57,7 @@ public class Q00694_BreakThroughTheHallOfSuffering extends Quest
if (event.equals("32603-02.html"))
{
qs.set("cond", "1");
qs.setState(State.STARTED);
playSound(player, "ItemSound.quest_accept");
qs.startQuest();
}
return htmltext;
}

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java vendored
View File

@@ -57,9 +57,7 @@ public class Q00695_DefendTheHallOfSuffering extends Quest
if (event.equals("32603-02.html"))
{
qs.set("cond", "1");
qs.setState(State.STARTED);
playSound(player, "ItemSound.quest_accept");
qs.startQuest();
}
return htmltext;
}

2
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java vendored
View File

@@ -244,7 +244,7 @@ public final class Q00708_PathToBecomingALordGludio extends Quest
}
else if (qs.isCond(4))
{
qs.set("cond", "5");
qs.setCond(5);
htmltext = "35100-09.html";
}
else if (qs.isCond(5))

8
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java vendored
View File

@@ -125,13 +125,13 @@ public final class Q00709_PathToBecomingALordDion extends Quest
}
case "30735-02.html":
{
qs.set("cond", "6");
qs.setCond(6);
break;
}
case "30735-05.html":
{
takeItems(player, BLOODY_AXE_BLACK_EPAULETTE, 1);
qs.set("cond", "8");
qs.setCond(8);
break;
}
case "31418-05.html":
@@ -232,7 +232,7 @@ public final class Q00709_PathToBecomingALordDion extends Quest
}
else if (qs.isCond(1))
{
qs.set("cond", "2");
qs.setCond(2);
htmltext = "35142-04.html";
}
else if (qs.isCond(2) || qs.isCond(3))
@@ -241,7 +241,7 @@ public final class Q00709_PathToBecomingALordDion extends Quest
}
else if (qs.isCond(4))
{
qs.set("cond", "5");
qs.setCond(5);
htmltext = "35142-07.html";
}
else if (qs.isCond(5))