diff --git a/L2J_Mobius_Underground/dist/game/data/html/item/17725.htm b/L2J_Mobius_Underground/dist/game/data/html/item/17725.htm new file mode 100644 index 0000000000..65dfd14671 --- /dev/null +++ b/L2J_Mobius_Underground/dist/game/data/html/item/17725.htm @@ -0,0 +1,8 @@ +Lada's Letter:
+Missarable advanturers, who lost their village
+Greetings! I am The Leader Of Magmeld Delegation Lada. +Our once beautiful and peacful villages have been emptied by plague, which causes whole body and bones to rot.I recruit like-minded persons,to try and find out the reason behind this.
+I think, that You are strong enough, to join us, for that reason i am sending you this massage.
+Would you mind to help us?

+ + \ No newline at end of file diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/33100-06a.html b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/33100-06a.html new file mode 100644 index 0000000000..90e998b1e2 --- /dev/null +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/33100-06a.html @@ -0,0 +1,3 @@ +Magmeld Emissary Leader Lada:
+I see you still have Glimmer Crystals come later, if you don't they will. + \ No newline at end of file diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java index 8339bbd084..edcdf8ae6d 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java @@ -27,6 +27,7 @@ import com.l2jmobius.gameserver.model.events.annotations.RegisterType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLevelChanged; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerPressTutorialMark; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; @@ -38,7 +39,7 @@ import com.l2jmobius.gameserver.network.serverpackets.TutorialShowQuestionMark; /** * Shadow of Terror: Blackish Red Fog (10301) - * @author St3eT + * @author St3eT, Gigi */ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest { @@ -60,11 +61,10 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest public Q10301_ShadowOfTerrorBlackishRedFog() { super(10301); - addStartNpc(LADA_LETTER); + addItemTalkId(LADA_LETTER); addTalkId(LADA, SLASKI); addSkillSeeId(LARGE_VERDANT_WILDS); addAttackId(WHISP); - addCondMinLevel(MIN_LEVEL, "33100-08.htm"); registerQuestItems(SPIRIT_ITEM, GLIMMER_CRYSTAL); } @@ -78,14 +78,6 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest { return htmltext; } - - if (event.equals("start")) - { - qs.startQuest(); - takeItems(player, LADA_LETTER, -1); - htmltext = "start.htm"; - } - switch (event) { case "33100-02.htm": @@ -100,15 +92,20 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest } case "33100-04.htm": { - qs.setCond(2); + qs.setCond(2, true); htmltext = event; giveItems(player, GLIMMER_CRYSTAL, 10); break; } case "giveCrystals": { - giveItems(player, GLIMMER_CRYSTAL, 5); - htmltext = "33100-06.html"; + if (getQuestItemsCount(player, GLIMMER_CRYSTAL) < 1) + { + giveItems(player, GLIMMER_CRYSTAL, 5); + htmltext = "33100-06.html"; + break; + } + htmltext = "33100-06a.html"; break; } default: @@ -128,6 +125,38 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest return htmltext; } + @Override + public String onItemTalk(L2ItemInstance item, L2PcInstance player) + { + String htmltext = getNoQuestMsg(player); + final QuestState qs = getQuestState(player, true); + + boolean startQuest = false; + switch (qs.getState()) + { + case State.CREATED: + { + startQuest = true; + break; + } + } + + if (startQuest) + { + if (player.getLevel() >= MIN_LEVEL) + { + qs.startQuest(); + takeItems(player, LADA_LETTER, -1); + htmltext = "start.htm"; + } + else + { + htmltext = "33100-08.htm"; + } + } + return htmltext; + } + @Override public String onTalk(L2Npc npc, L2PcInstance player) { @@ -180,7 +209,6 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest final QuestState qs = getQuestState(caster, false); if ((qs != null) && qs.isCond(2) && (skill.getId() == WHISP_SKILL)) { - // takeItems(caster, GLIMMER_CRYSTAL, 1); for (int i1 = 0; i1 < 3; i1++) { final L2Npc whisp = addSpawn(WHISP, caster.getX() + getRandom(-20, 20), caster.getY() + getRandom(-20, 20), caster.getZ(), 0, true, 30000, false); diff --git a/L2J_Mobius_Underground/dist/game/data/stats/items/17700-17799.xml b/L2J_Mobius_Underground/dist/game/data/stats/items/17700-17799.xml index 19763aaae2..72d6fc530f 100644 --- a/L2J_Mobius_Underground/dist/game/data/stats/items/17700-17799.xml +++ b/L2J_Mobius_Underground/dist/game/data/stats/items/17700-17799.xml @@ -369,7 +369,7 @@ - +