From a007531506be6d37edd87e2c7e876741a754f95f Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 1 Dec 2019 10:14:54 +0000
Subject: [PATCH] Updated quests 10830 and 10831. Contributed by Dmitri.
---
.../34055-00.htm | 2 +-
.../Q10830_TheLostGardenOfSpirits.java | 6 ++-
.../Q10831_UnbelievableSight/34056-00.htm | 2 +-
.../Q10831_UnbelievableSight.java | 39 +++++++++----------
.../Q10831_UnbelievableSight/noItem.htm | 4 --
5 files changed, 24 insertions(+), 29 deletions(-)
delete mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/noItem.htm
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/34055-00.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/34055-00.htm
index 52fbde127a..07f519b07c 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/34055-00.htm
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/34055-00.htm
@@ -1,4 +1,4 @@
Master Cyphona:
Hm? You want to help? Just go away, that's helping.
-(This quest is for characters Lv. 100 and higher who have completed the "In Search of the Cause" quest.)
+(This quest is for characters Lv. 102 and higher who have completed the "In Search of the Cause" quest and must have 1 level of Unworldly Visitors faction.)
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
index 5389dad860..47855fd894 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10830_TheLostGardenOfSpirits/Q10830_TheLostGardenOfSpirits.java
@@ -16,6 +16,7 @@
*/
package quests.Q10830_TheLostGardenOfSpirits;
+import org.l2jmobius.gameserver.enums.Faction;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.Quest;
@@ -49,7 +50,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
private static final int UNSTABLE_SPIRITS_ENERGY = 45821;
private static final int SOE = 46158;
// Misc
- private static final int MIN_LEVEL = 100;
+ private static final int MIN_LEVEL = 102;
public Q10830_TheLostGardenOfSpirits()
{
@@ -60,6 +61,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
registerQuestItems(UNSTABLE_SPIRITS_ENERGY);
addCondMinLevel(MIN_LEVEL, "34055-00.htm");
addCondCompletedQuest(Q10829_InSearchOfTheCause.class.getSimpleName(), "34055-00.htm");
+ addFactionLevel(Faction.UNWORLDLY_VISITORS, 1, "34055-00.htm");
}
@Override
@@ -89,7 +91,7 @@ public class Q10830_TheLostGardenOfSpirits extends Quest
case "34055-07.html":
{
giveItems(player, SOE, 1);
- addExpAndSp(player, 1637472704L, 14237820);
+ addExpAndSp(player, 44442855900L, 44442720);
qs.exitQuest(false, true);
htmltext = event;
break;
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/34056-00.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/34056-00.htm
index a08afe89e8..b57d9e5e27 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/34056-00.htm
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/34056-00.htm
@@ -1,4 +1,4 @@
Magister Belas:
Oh, you are so ignorant.
-(This quest may only be undertaken by characters Lv. 100 or above who have completed the quest "The Lost Garden of Spirits.")
+(This quest may only be undertaken by characters Lv. 102 or above who have completed the quest "The Lost Garden of Spirits." and must have 2 level of Unworldly Visitors faction.)
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
index 36e75ea70b..58b8fc59c8 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/Q10831_UnbelievableSight.java
@@ -16,6 +16,7 @@
*/
package quests.Q10831_UnbelievableSight;
+import org.l2jmobius.gameserver.enums.Faction;
import org.l2jmobius.gameserver.model.actor.Npc;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.quest.Quest;
@@ -34,7 +35,7 @@ public class Q10831_UnbelievableSight extends Quest
// NPC
private static final int BELAS = 34056;
// Monsters
- private static final int EL_FLOATO = 23559;
+ private static final int ENERGY_OF_WIND = 19647;
private static final int KERBEROS_LAGER = 23550;
private static final int KERBEROS_FORT = 23551;
private static final int KERBEROS_NERO = 23552;
@@ -43,24 +44,23 @@ public class Q10831_UnbelievableSight extends Quest
private static final int FURY_SYLPH_PURKA = 23556;
private static final int FURY_KERBEROS_LEGER = 23557;
private static final int FURY_KERBEROS_NERO = 23558;
- // Item's
- private static final int UNBALANCED_ENERGY = 45822;
- private static final int MARK_OF_TRUST_LOW_GRADE = 45840;
- private static final int SPIRIT_EVIL_TOUGHT_PIACE = 46130;
- private static final int SOE = 46158;
+ // Items
+ private static final int TRANSFORMED_ENERGY = 48005;
+ private static final int SOE = 46158; // Scroll of Escape: Blackbird Campsite
// Misc
- private static final int MIN_LEVEL = 100;
+ private static final int MIN_LEVEL = 102;
public Q10831_UnbelievableSight()
{
super(10831);
addStartNpc(BELAS);
addTalkId(BELAS);
- addKillId(EL_FLOATO);
+ addKillId(ENERGY_OF_WIND);
addKillId(KERBEROS_LAGER, KERBEROS_FORT, KERBEROS_NERO, FURY_SYLPH_BARRENA, FURY_SYLPH_TEMPTRESS, FURY_SYLPH_PURKA, FURY_KERBEROS_LEGER, FURY_KERBEROS_NERO);
- registerQuestItems(UNBALANCED_ENERGY);
+ registerQuestItems(TRANSFORMED_ENERGY);
addCondMinLevel(MIN_LEVEL, "34056-00.htm");
addCondCompletedQuest(Q10830_TheLostGardenOfSpirits.class.getSimpleName(), "34056-00.htm");
+ addFactionLevel(Faction.UNWORLDLY_VISITORS, 2, "34056-00.htm");
}
@Override
@@ -89,9 +89,8 @@ public class Q10831_UnbelievableSight extends Quest
}
case "34056-07.html":
{
- giveItems(player, SOE, 1);
- giveItems(player, SPIRIT_EVIL_TOUGHT_PIACE, 1);
- addExpAndSp(player, 1637472704L, 14237820);
+ giveItems(player, SOE, 1); // Scroll of Escape: Blackbird Campsite
+ addExpAndSp(player, 44442855900L, 44442720);
qs.exitQuest(false, true);
htmltext = event;
break;
@@ -110,11 +109,6 @@ public class Q10831_UnbelievableSight extends Quest
{
case State.CREATED:
{
- if (!hasQuestItems(player, MARK_OF_TRUST_LOW_GRADE))
- {
- htmltext = "noItem.htm";
- break;
- }
htmltext = "34056-01.htm";
break;
}
@@ -156,13 +150,16 @@ public class Q10831_UnbelievableSight extends Quest
case FURY_KERBEROS_LEGER:
case FURY_KERBEROS_NERO:
{
- final Npc mob = addSpawn(EL_FLOATO, npc.getX(), npc.getY(), npc.getZ(), 0, true, 120000);
- addAttackPlayerDesire(mob, killer, 5);
+ if (getRandom(100) < 50)
+ {
+ final Npc mob = addSpawn(ENERGY_OF_WIND, npc.getX(), npc.getY(), npc.getZ(), 0, true, 120000);
+ addAttackPlayerDesire(mob, killer, 5);
+ }
break;
}
- case EL_FLOATO:
+ case ENERGY_OF_WIND:
{
- if (giveItemRandomly(killer, npc, UNBALANCED_ENERGY, 1, 100, 0.5, true))
+ if (giveItemRandomly(killer, npc, TRANSFORMED_ENERGY, 1, 10, 0.5, true))
{
qs.setCond(2, true);
}
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/noItem.htm b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/noItem.htm
deleted file mode 100644
index 4fac100526..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/quests/Q10831_UnbelievableSight/noItem.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-Magister Belas:
-You don't meet the requirements. How can you not know that?
-(This quest may only be undertaken by characters with a Mark of Trust (Low-grade).)
-
\ No newline at end of file