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

Simulated onTalk rework.

Browse Source
This commit is contained in:
MobiusDev
2017-08-15 00:04:22 +00:00
parent 97f941cbaa
commit e2569aae3a
19 changed files with 684 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminShowQuests.java vendored
View File

@@ -321,6 +321,7 @@ public class AdminShowQuests implements IAdminCommandHandler
{
QuestState qs = target.getQuestState(val[0]);
final String[] outval = new String[3];
qs.setSimulated(false);
if (val[1].equals("state"))
{

28
L2J_Mobius_Classic/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java vendored
View File

@@ -87,9 +87,6 @@ public class QuestLink implements IBypassHandler
final StringBuilder sbCanStart = new StringBuilder(128);
final StringBuilder sbCantStart = new StringBuilder(128);
final StringBuilder sbCompleted = new StringBuilder(128);
Quest lastSavedAvailableQuest = null;
Quest lastSavedProgressQuest = null;
int questCounter = 0;
//@formatter:off
final Set<Quest> startingQuests = npc.getListeners(EventType.ON_NPC_QUEST_START).stream()
@@ -126,8 +123,6 @@ public class QuestLink implements IBypassHandler
sbCanStart.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
sbCanStart.append(quest.isCustomQuest() ? quest.getPath() : "<fstring>" + quest.getNpcStringId() + "01</fstring>");
sbCanStart.append("</button></font>");
lastSavedAvailableQuest = quest;
questCounter++;
}
else
{
@@ -135,17 +130,18 @@ public class QuestLink implements IBypassHandler
sbCantStart.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
sbCantStart.append(quest.isCustomQuest() ? quest.getPath() : "<fstring>" + quest.getNpcStringId() + "01</fstring>");
sbCantStart.append("</button></font>");
questCounter++;
}
}
else if (Quest.getNoQuestMsg(player).equals(quest.onTalk(npc, player, true)))
{
continue;
}
else if (qs.isStarted())
{
sbStarted.append("<font color=\"ffdd66\">");
sbStarted.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
sbStarted.append(quest.isCustomQuest() ? quest.getPath() + " (In Progress)" : "<fstring>" + quest.getNpcStringId() + "02</fstring>");
sbStarted.append("</button></font>");
lastSavedProgressQuest = quest;
questCounter++;
}
else if (qs.isCompleted())
{
@@ -153,21 +149,6 @@ public class QuestLink implements IBypassHandler
sbCompleted.append("<button icon=\"quest\" align=\"left\" action=\"bypass -h npc_" + npc.getObjectId() + "_Quest " + quest.getName() + "\">");
sbCompleted.append(quest.isCustomQuest() ? quest.getPath() + " (Done) " : "<fstring>" + quest.getNpcStringId() + "03</fstring>");
sbCompleted.append("</button></font>");
questCounter++;
}
}
if (questCounter == 1)
{
if (lastSavedProgressQuest != null)
{
showQuestWindow(player, npc, lastSavedProgressQuest.getName());
return;
}
if (lastSavedAvailableQuest != null)
{
showQuestWindow(player, npc, lastSavedAvailableQuest.getName());
return;
}
}
@@ -268,6 +249,7 @@ public class QuestLink implements IBypassHandler
.filter(Quest.class::isInstance)
.map(Quest.class::cast)
.filter(quest -> (quest.getId() > 0) && (quest.getId() < 20000) && (quest.getId() != 255))
.filter(quest -> !Quest.getNoQuestMsg(player).equals(quest.onTalk(npc, player, true)))
.distinct()
.collect(Collectors.toSet());
//@formatter:on

32
L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00348_AnArrogantSearch/Q00348_AnArrogantSearch.java vendored
View File

@@ -357,8 +357,8 @@ public class Q00348_AnArrogantSearch extends Quest
st.setMemoStateEx(1, st.getMemoStateEx(1) + 10);
if ((st.getMemoStateEx(1) % 10) == 0)
{
st.clearRadar();
st.addRadar(-2908, 44128, -2712);
clearRadar(attacker);
addRadar(attacker, -2908, 44128, -2712);
}
else
{
@@ -1073,7 +1073,7 @@ public class Q00348_AnArrogantSearch extends Quest
if (hasQuestItems(player, FIRST_KEY_OF_ARK))
{
giveItems(player, BLOOD_OF_SAINT, 1);
st.clearRadar();
clearRadar(player);
if ((st.getMemoStateEx(1) % 10) == 0)
{
if (hasQuestItems(player, BOOK_OF_SAINT, BOUGH_OF_SAINT))
@@ -1119,7 +1119,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
giveItems(player, BOOK_OF_SAINT, 1);
takeItems(player, SECOND_KEY_OF_ARK, 1);
st.clearRadar();
clearRadar(player);
if ((st.getMemoStateEx(1) % 10) == 0)
{
if (hasQuestItems(player, BLOOD_OF_SAINT, BOUGH_OF_SAINT))
@@ -1172,7 +1172,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
giveItems(player, BOUGH_OF_SAINT, 1);
takeItems(player, THIRD_KEY_OF_ARK, 1);
st.clearRadar();
clearRadar(player);
if ((st.getMemoStateEx(1) % 10) == 0)
{
if (hasQuestItems(player, BLOOD_OF_SAINT, BOOK_OF_SAINT))
@@ -1224,7 +1224,7 @@ public class Q00348_AnArrogantSearch extends Quest
if ((st.getMemoState() < 8) && (((st.getMemoStateEx(1) % 100) / 10) == 1) && !hasQuestItems(player, FIRST_KEY_OF_ARK) && !hasQuestItems(player, BLOOD_OF_SAINT))
{
htmltext = "30980-02.html";
st.clearRadar();
clearRadar(player);
if ((st.getMemoStateEx(1) % 10) != 0)
{
st.setCond(18, true);
@@ -1237,7 +1237,7 @@ public class Q00348_AnArrogantSearch extends Quest
else if ((st.getMemoState() < 8) && (((st.getMemoStateEx(1) % 100) / 10) == 2) && !hasQuestItems(player, FIRST_KEY_OF_ARK) && !hasQuestItems(player, BLOOD_OF_SAINT))
{
giveItems(player, FIRST_KEY_OF_ARK, 1);
st.addRadar(-418, 44174, -3568);
addRadar(player, -418, 44174, -3568);
htmltext = "30980-03.html";
}
else if (hasAtLeastOneQuestItem(player, FIRST_KEY_OF_ARK, BLOOD_OF_SAINT))
@@ -1253,7 +1253,7 @@ public class Q00348_AnArrogantSearch extends Quest
int i0 = st.getMemoStateEx(1) + 100;
if ((i0 % 10) == 0)
{
st.addRadar(181472, 7158, -2725);
addRadar(player, 181472, 7158, -2725);
}
else
{
@@ -1269,7 +1269,7 @@ public class Q00348_AnArrogantSearch extends Quest
// retail typo
if ((st.getMemoStateEx(1) % 10) == 0)
{
st.addRadar(181472, 7158, -2725);
addRadar(player, 181472, 7158, -2725);
}
htmltext = "31001-03.html";
@@ -1278,7 +1278,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
if ((st.getMemoStateEx(1) % 10) == 0)
{
st.addRadar(181472, 7158, -2725);
addRadar(player, 181472, 7158, -2725);
}
htmltext = "31001-04.html";
@@ -1296,7 +1296,7 @@ public class Q00348_AnArrogantSearch extends Quest
int i0 = st.getMemoStateEx(1) + 10;
if ((i0 % 10) == 0)
{
st.addRadar(2908, 44128, -2712);
addRadar(player, 2908, 44128, -2712);
}
else
{
@@ -1312,7 +1312,7 @@ public class Q00348_AnArrogantSearch extends Quest
// retail typo
if ((st.getMemoStateEx(1) % 10) == 0)
{
st.addRadar(2908, 44128, -2712);
addRadar(player, 2908, 44128, -2712);
}
htmltext = "30144-03.html";
@@ -1321,7 +1321,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
if ((st.getMemoStateEx(1) % 10) == 0)
{
st.addRadar(2908, 44128, -2712);
addRadar(player, 2908, 44128, -2712);
}
htmltext = "30144-04.html";
@@ -1339,7 +1339,7 @@ public class Q00348_AnArrogantSearch extends Quest
int i0 = st.getMemoStateEx(1) + 1000;
if ((i0 % 10) == 0)
{
st.addRadar(50693, 158674, 376);
addRadar(player, 50693, 158674, 376);
}
else
{
@@ -1355,7 +1355,7 @@ public class Q00348_AnArrogantSearch extends Quest
// retail typo
if ((st.getMemoStateEx(1) % 10) == 0)
{
st.addRadar(50693, 158674, 376);
addRadar(player, 50693, 158674, 376);
}
htmltext = "30645-03.html";
@@ -1364,7 +1364,7 @@ public class Q00348_AnArrogantSearch extends Quest
{
if ((st.getMemoStateEx(1) % 10) == 0)
{
st.addRadar(50693, 158674, 376);
addRadar(player, 50693, 158674, 376);
}
htmltext = "30645-04.html";