From d6d45a05954d8a7c46d70b21a1b755fdcfe82af4 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 20 Sep 2021 22:39:39 +0000 Subject: [PATCH] Addition of new condition for quest Saga of Legend (10673). Thanks to MacuK. --- .../quests/Q10673_SagaOfLegend/30857-06.html | 1 + .../quests/Q10673_SagaOfLegend/30857-07.html | 2 +- .../quests/Q10673_SagaOfLegend/30857-07a.html | 2 +- .../quests/Q10673_SagaOfLegend/30857-07b.html | 3 +++ .../quests/Q10673_SagaOfLegend/30857-08.html | 2 +- .../quests/Q10673_SagaOfLegend/30857-08a.html | 4 ---- .../Q10673_SagaOfLegend.java | 21 +++++++++++-------- .../quests/Q10673_SagaOfLegend/30857-06.html | 1 + .../quests/Q10673_SagaOfLegend/30857-07.html | 2 +- .../quests/Q10673_SagaOfLegend/30857-07a.html | 2 +- .../quests/Q10673_SagaOfLegend/30857-07b.html | 3 +++ .../quests/Q10673_SagaOfLegend/30857-08.html | 2 +- .../quests/Q10673_SagaOfLegend/30857-08a.html | 4 ---- .../Q10673_SagaOfLegend.java | 21 +++++++++++-------- 14 files changed, 38 insertions(+), 32 deletions(-) create mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07b.html delete mode 100644 L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08a.html create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07b.html delete mode 100644 L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08a.html diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-06.html b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-06.html index 6230b3fa48..acd68b3ef4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-06.html +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-06.html @@ -2,4 +2,5 @@ Go investigate Silent Valley or Devil's Isle. Go to the hunting zone of your choice, defeat any monsters. You need to defeat 700 monsters in total.
+ \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07.html b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07.html index 4412a5970e..35795b05d8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07.html +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07.html @@ -1,3 +1,3 @@ Orven:
-Investigate Silent Valley. You need to defeat 700 monsters in total. +Investigate Cruma Tower 2nd Floor. You need to defeat 700 monsters in total. \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07a.html b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07a.html index 9d35f1547a..3a32e4acee 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07a.html +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07a.html @@ -1,3 +1,3 @@ Orven:
-Investigate Devil's Isle. You need to defeat 700 monsters in total. +Investigate Sillent Valley. You need to defeat 700 monsters in total. \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07b.html b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07b.html new file mode 100644 index 0000000000..e3826524fe --- /dev/null +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07b.html @@ -0,0 +1,3 @@ +Orven:
+Investigate Plains of Lizardmen. You need to defeat 700 monsters in total. + \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08.html b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08.html index a74293942f..eb88b46ea8 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08.html +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08.html @@ -1,4 +1,4 @@ Orven:
-Go investigate Silent Valley or Devil's Isle. +Go investigate Silent Valley or Devil's Isle or Plains of Lizardmen. You need to defeat 700 monsters in total. \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08a.html b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08a.html deleted file mode 100644 index a74293942f..0000000000 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08a.html +++ /dev/null @@ -1,4 +0,0 @@ -Orven:
-Go investigate Silent Valley or Devil's Isle. -You need to defeat 700 monsters in total. - \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java index 447009df53..6d39d30414 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java @@ -154,9 +154,15 @@ public class Q10673_SagaOfLegend extends Quest htmltext = event; break; } + case "30857-07b.html": + { + qs.setCond(4, true); + htmltext = event; + break; + } case "30857-10.html": { - if (qs.isCond(4)) + if (qs.isCond(5)) { giveItems(player, MAGICAL_TABLET, 10); qs.exitQuest(false, true); @@ -193,16 +199,13 @@ public class Q10673_SagaOfLegend extends Quest break; } case 2: + case 3: + case 4: { htmltext = "30857-08.html"; break; } - case 3: - { - htmltext = "30857-08a.html"; - break; - } - case 4: + case 5: { htmltext = "30857-09.html"; break; @@ -223,7 +226,7 @@ public class Q10673_SagaOfLegend extends Quest public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && (qs.getCond() > 1)) + if ((qs != null) && ((qs.getCond() > 1) && (qs.getCond() < 5))) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; if (killCount < 700) @@ -234,7 +237,7 @@ public class Q10673_SagaOfLegend extends Quest } else { - qs.setCond(4, true); + qs.setCond(5, true); qs.unset(KILL_COUNT_VAR); } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-06.html b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-06.html index 6230b3fa48..acd68b3ef4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-06.html +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-06.html @@ -2,4 +2,5 @@ Go investigate Silent Valley or Devil's Isle. Go to the hunting zone of your choice, defeat any monsters. You need to defeat 700 monsters in total.
+ \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07.html b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07.html index 4412a5970e..35795b05d8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07.html +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07.html @@ -1,3 +1,3 @@ Orven:
-Investigate Silent Valley. You need to defeat 700 monsters in total. +Investigate Cruma Tower 2nd Floor. You need to defeat 700 monsters in total. \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07a.html b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07a.html index 9d35f1547a..3a32e4acee 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07a.html +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07a.html @@ -1,3 +1,3 @@ Orven:
-Investigate Devil's Isle. You need to defeat 700 monsters in total. +Investigate Sillent Valley. You need to defeat 700 monsters in total. \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07b.html b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07b.html new file mode 100644 index 0000000000..e3826524fe --- /dev/null +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-07b.html @@ -0,0 +1,3 @@ +Orven:
+Investigate Plains of Lizardmen. You need to defeat 700 monsters in total. + \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08.html b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08.html index a74293942f..eb88b46ea8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08.html +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08.html @@ -1,4 +1,4 @@ Orven:
-Go investigate Silent Valley or Devil's Isle. +Go investigate Silent Valley or Devil's Isle or Plains of Lizardmen. You need to defeat 700 monsters in total. \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08a.html b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08a.html deleted file mode 100644 index a74293942f..0000000000 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/30857-08a.html +++ /dev/null @@ -1,4 +0,0 @@ -Orven:
-Go investigate Silent Valley or Devil's Isle. -You need to defeat 700 monsters in total. - \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java index ccb9325693..b19b9095a8 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java @@ -138,9 +138,15 @@ public class Q10673_SagaOfLegend extends Quest htmltext = event; break; } + case "30857-07b.html": + { + qs.setCond(4, true); + htmltext = event; + break; + } case "30857-10.html": { - if (qs.isCond(4)) + if (qs.isCond(5)) { giveItems(player, MAGICAL_TABLET, 10); qs.exitQuest(false, true); @@ -177,16 +183,13 @@ public class Q10673_SagaOfLegend extends Quest break; } case 2: + case 3: + case 4: { htmltext = "30857-08.html"; break; } - case 3: - { - htmltext = "30857-08a.html"; - break; - } - case 4: + case 5: { htmltext = "30857-09.html"; break; @@ -207,7 +210,7 @@ public class Q10673_SagaOfLegend extends Quest public String onKill(Npc npc, PlayerInstance killer, boolean isSummon) { final QuestState qs = getQuestState(killer, false); - if ((qs != null) && (qs.getCond() > 1)) + if ((qs != null) && ((qs.getCond() > 1) && (qs.getCond() < 5))) { final int killCount = qs.getInt(KILL_COUNT_VAR) + 1; if (killCount < 700) @@ -218,7 +221,7 @@ public class Q10673_SagaOfLegend extends Quest } else { - qs.setCond(4, true); + qs.setCond(5, true); qs.unset(KILL_COUNT_VAR); } }