From 6972b74a10569fc13b11ebeacbf9d4723fb69216 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 15 Apr 2019 17:54:01 +0000 Subject: [PATCH] Various script improvements. Contributed by NightBR. --- .../dist/game/data/scripts/quests/LetterQuest.java | 5 ++++- .../dist/game/data/scripts/quests/LetterQuest.java | 5 ++++- .../dist/game/data/scripts/quests/LetterQuest.java | 5 ++++- .../dist/game/data/scripts/quests/LetterQuest.java | 5 ++++- .../data/scripts/ai/areas/Aden/Herphah/Herphah.java | 9 ++++++++- .../game/data/scripts/ai/areas/Aden/Penny/Penny.java | 9 ++++++++- .../dist/game/data/scripts/quests/LetterQuest.java | 5 ++++- .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 ...8_DimensionalExplorationOfTheUnworldlyVisitors.java | 2 +- .../not_done/Q10571_StrategicReconciliation.java | 2 +- .../dist/game/data/stats/skills/18500-18599.xml | 10 +++++----- .../data/scripts/ai/areas/Aden/Herphah/Herphah.java | 9 ++++++++- .../game/data/scripts/ai/areas/Aden/Penny/Penny.java | 9 ++++++++- .../dist/game/data/scripts/quests/LetterQuest.java | 5 ++++- .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 ...8_DimensionalExplorationOfTheUnworldlyVisitors.java | 2 +- .../not_done/Q10571_StrategicReconciliation.java | 2 +- .../dist/game/data/stats/skills/18500-18599.xml | 10 +++++----- .../data/scripts/ai/areas/Aden/Herphah/Herphah.java | 9 ++++++++- .../game/data/scripts/ai/areas/Aden/Penny/Penny.java | 9 ++++++++- .../dist/game/data/scripts/quests/LetterQuest.java | 5 ++++- .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 .../{noLevel.html => nolevel.html} | 0 ...8_DimensionalExplorationOfTheUnworldlyVisitors.java | 2 +- .../not_done/Q10571_StrategicReconciliation.java | 2 +- .../dist/game/data/stats/skills/18500-18599.xml | 10 +++++----- 34 files changed, 97 insertions(+), 34 deletions(-) rename L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/{noLevel.html => nolevel.html} (100%) rename L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/{noLevel.html => nolevel.html} (100%) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/LetterQuest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/LetterQuest.java index 1f2646db2d..6a918c6dde 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/LetterQuest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/LetterQuest.java @@ -195,12 +195,15 @@ public abstract class LetterQuest extends Quest { player.teleToLocation(_startTeleport); takeItems(player, _startSOE, -1); - qs.setCond(2, true); } } player.sendPacket(TutorialCloseHtml.STATIC_PACKET); player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML); } + if ((qs != null) && qs.isCond(1)) + { + qs.setCond(2, true); + } } @RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/LetterQuest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/LetterQuest.java index 1f2646db2d..6a918c6dde 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/LetterQuest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/LetterQuest.java @@ -195,12 +195,15 @@ public abstract class LetterQuest extends Quest { player.teleToLocation(_startTeleport); takeItems(player, _startSOE, -1); - qs.setCond(2, true); } } player.sendPacket(TutorialCloseHtml.STATIC_PACKET); player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML); } + if ((qs != null) && qs.isCond(1)) + { + qs.setCond(2, true); + } } @RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/LetterQuest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/LetterQuest.java index c9b348b938..1dc80ae502 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/LetterQuest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/LetterQuest.java @@ -195,12 +195,15 @@ public abstract class LetterQuest extends Quest { player.teleToLocation(_startTeleport); takeItems(player, _startSOE, -1); - qs.setCond(2, true); } } player.sendPacket(TutorialCloseHtml.STATIC_PACKET); player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML); } + if ((qs != null) && qs.isCond(1)) + { + qs.setCond(2, true); + } } @RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/LetterQuest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/LetterQuest.java index c9b348b938..1dc80ae502 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/LetterQuest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/LetterQuest.java @@ -195,12 +195,15 @@ public abstract class LetterQuest extends Quest { player.teleToLocation(_startTeleport); takeItems(player, _startSOE, -1); - qs.setCond(2, true); } } player.sendPacket(TutorialCloseHtml.STATIC_PACKET); player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML); } + if ((qs != null) && qs.isCond(1)) + { + qs.setCond(2, true); + } } @RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java index 190ce67d17..6f21664a12 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java @@ -31,6 +31,13 @@ public class Herphah extends AbstractNpcAI { // NPC private static final int HERPHAH = 34362; + // Misc + private static final String[] RANDOM_VOICE = + { + "Npcdialog1.herphah_ep50_greeting_1", + "Npcdialog1.herphah_ep50_greeting_2", + "Npcdialog1.herphah_ep50_greeting_3" + }; private Herphah() { @@ -67,7 +74,7 @@ public class Herphah extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, PlayerInstance player) { - player.sendPacket(new PlaySound(3, "Npcdialog1.herphah_faction_1", 0, 0, 0, 0, 0)); + player.sendPacket(new PlaySound(3, RANDOM_VOICE[getRandom(3)], 0, 0, 0, 0, 0)); return "34362.html"; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java index 914b0629e0..35cc115b23 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java @@ -31,6 +31,13 @@ public class Penny extends AbstractNpcAI { // NPC private static final int PENNY = 34413; + // Misc + private static final String[] RANDOM_VOICE = + { + "Npcdialog1.peny_ep50_greeting_7", + "Npcdialog1.peny_ep50_greeting_8", + "Npcdialog1.peny_ep50_greeting_9" + }; private Penny() { @@ -61,7 +68,7 @@ public class Penny extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, PlayerInstance player) { - player.sendPacket(new PlaySound(3, "Npcdialog1.penny_faction_1", 0, 0, 0, 0, 0)); + player.sendPacket(new PlaySound(3, RANDOM_VOICE[getRandom(3)], 0, 0, 0, 0, 0)); return "34413.html"; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/LetterQuest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/LetterQuest.java index c9b348b938..1dc80ae502 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/LetterQuest.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/LetterQuest.java @@ -195,12 +195,15 @@ public abstract class LetterQuest extends Quest { player.teleToLocation(_startTeleport); takeItems(player, _startSOE, -1); - qs.setCond(2, true); } } player.sendPacket(TutorialCloseHtml.STATIC_PACKET); player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML); } + if ((qs != null) && qs.isCond(1)) + { + qs.setCond(2, true); + } } @RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/noLevel.html b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/nolevel.html similarity index 100% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/noLevel.html rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/nolevel.html diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/noLevel.html b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/nolevel.html similarity index 100% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/noLevel.html rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/nolevel.html diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/noLevel.html b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/nolevel.html similarity index 100% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/noLevel.html rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/nolevel.html diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/noLevel.html b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/nolevel.html similarity index 100% rename from L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/noLevel.html rename to L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/nolevel.html diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java index bf662a4210..d9452c94dc 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; */ public class Q00738_DimensionalExplorationOfTheUnworldlyVisitors extends Quest { - private static final int START_NPC = 34360; + private static final int START_NPC = 34359; public Q00738_DimensionalExplorationOfTheUnworldlyVisitors() { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java index bf47669d49..fdb910e3fd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; */ public class Q10571_StrategicReconciliation extends Quest { - private static final int START_NPC = 34360; + private static final int START_NPC = 34359; public Q10571_StrategicReconciliation() { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18500-18599.xml index 557fbd885d..a7fcb18327 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18500-18599.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/18500-18599.xml @@ -862,7 +862,7 @@ icon.nshop_bless_of_paagrio A1 - + 1500 2 @@ -908,10 +908,10 @@ -56633 -2776 - - 83378 - 147999 - -3400 + + 84015 + 147219 + -3395 72090 diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java index 190ce67d17..6f21664a12 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java @@ -31,6 +31,13 @@ public class Herphah extends AbstractNpcAI { // NPC private static final int HERPHAH = 34362; + // Misc + private static final String[] RANDOM_VOICE = + { + "Npcdialog1.herphah_ep50_greeting_1", + "Npcdialog1.herphah_ep50_greeting_2", + "Npcdialog1.herphah_ep50_greeting_3" + }; private Herphah() { @@ -67,7 +74,7 @@ public class Herphah extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, PlayerInstance player) { - player.sendPacket(new PlaySound(3, "Npcdialog1.herphah_faction_1", 0, 0, 0, 0, 0)); + player.sendPacket(new PlaySound(3, RANDOM_VOICE[getRandom(3)], 0, 0, 0, 0, 0)); return "34362.html"; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java index 914b0629e0..35cc115b23 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java @@ -31,6 +31,13 @@ public class Penny extends AbstractNpcAI { // NPC private static final int PENNY = 34413; + // Misc + private static final String[] RANDOM_VOICE = + { + "Npcdialog1.peny_ep50_greeting_7", + "Npcdialog1.peny_ep50_greeting_8", + "Npcdialog1.peny_ep50_greeting_9" + }; private Penny() { @@ -61,7 +68,7 @@ public class Penny extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, PlayerInstance player) { - player.sendPacket(new PlaySound(3, "Npcdialog1.penny_faction_1", 0, 0, 0, 0, 0)); + player.sendPacket(new PlaySound(3, RANDOM_VOICE[getRandom(3)], 0, 0, 0, 0, 0)); return "34413.html"; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/LetterQuest.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/LetterQuest.java index c9b348b938..1dc80ae502 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/LetterQuest.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/LetterQuest.java @@ -195,12 +195,15 @@ public abstract class LetterQuest extends Quest { player.teleToLocation(_startTeleport); takeItems(player, _startSOE, -1); - qs.setCond(2, true); } } player.sendPacket(TutorialCloseHtml.STATIC_PACKET); player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML); } + if ((qs != null) && qs.isCond(1)) + { + qs.setCond(2, true); + } } @RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/noLevel.html b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/nolevel.html similarity index 100% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/noLevel.html rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/nolevel.html diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/noLevel.html b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/nolevel.html similarity index 100% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/noLevel.html rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/nolevel.html diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/noLevel.html b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/nolevel.html similarity index 100% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/noLevel.html rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/nolevel.html diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/noLevel.html b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/nolevel.html similarity index 100% rename from L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/noLevel.html rename to L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/nolevel.html diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java index bf662a4210..d9452c94dc 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; */ public class Q00738_DimensionalExplorationOfTheUnworldlyVisitors extends Quest { - private static final int START_NPC = 34360; + private static final int START_NPC = 34359; public Q00738_DimensionalExplorationOfTheUnworldlyVisitors() { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java index bf47669d49..fdb910e3fd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; */ public class Q10571_StrategicReconciliation extends Quest { - private static final int START_NPC = 34360; + private static final int START_NPC = 34359; public Q10571_StrategicReconciliation() { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18500-18599.xml index ae239fa24e..9cc94c9189 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18500-18599.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/18500-18599.xml @@ -874,7 +874,7 @@ icon.nshop_bless_of_paagrio A1 - + 1500 2 @@ -920,10 +920,10 @@ -56633 -2776 - - 83378 - 147999 - -3400 + + 84015 + 147219 + -3395 72090 diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java index 190ce67d17..6f21664a12 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Herphah/Herphah.java @@ -31,6 +31,13 @@ public class Herphah extends AbstractNpcAI { // NPC private static final int HERPHAH = 34362; + // Misc + private static final String[] RANDOM_VOICE = + { + "Npcdialog1.herphah_ep50_greeting_1", + "Npcdialog1.herphah_ep50_greeting_2", + "Npcdialog1.herphah_ep50_greeting_3" + }; private Herphah() { @@ -67,7 +74,7 @@ public class Herphah extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, PlayerInstance player) { - player.sendPacket(new PlaySound(3, "Npcdialog1.herphah_faction_1", 0, 0, 0, 0, 0)); + player.sendPacket(new PlaySound(3, RANDOM_VOICE[getRandom(3)], 0, 0, 0, 0, 0)); return "34362.html"; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java index 914b0629e0..35cc115b23 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/Aden/Penny/Penny.java @@ -31,6 +31,13 @@ public class Penny extends AbstractNpcAI { // NPC private static final int PENNY = 34413; + // Misc + private static final String[] RANDOM_VOICE = + { + "Npcdialog1.peny_ep50_greeting_7", + "Npcdialog1.peny_ep50_greeting_8", + "Npcdialog1.peny_ep50_greeting_9" + }; private Penny() { @@ -61,7 +68,7 @@ public class Penny extends AbstractNpcAI @Override public String onFirstTalk(Npc npc, PlayerInstance player) { - player.sendPacket(new PlaySound(3, "Npcdialog1.penny_faction_1", 0, 0, 0, 0, 0)); + player.sendPacket(new PlaySound(3, RANDOM_VOICE[getRandom(3)], 0, 0, 0, 0, 0)); return "34413.html"; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/LetterQuest.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/LetterQuest.java index c9b348b938..1dc80ae502 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/LetterQuest.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/LetterQuest.java @@ -195,12 +195,15 @@ public abstract class LetterQuest extends Quest { player.teleToLocation(_startTeleport); takeItems(player, _startSOE, -1); - qs.setCond(2, true); } } player.sendPacket(TutorialCloseHtml.STATIC_PACKET); player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML); } + if ((qs != null) && qs.isCond(1)) + { + qs.setCond(2, true); + } } @RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/noLevel.html b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/nolevel.html similarity index 100% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/noLevel.html rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00561_BasicMissionHarnakUndergroundRuins/nolevel.html diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/noLevel.html b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/nolevel.html similarity index 100% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/noLevel.html rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00562_BasicMissionAltarOfEvil/nolevel.html diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/noLevel.html b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/nolevel.html similarity index 100% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/noLevel.html rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00563_BasicMissionBloodySwampland/nolevel.html diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/noLevel.html b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/nolevel.html similarity index 100% rename from L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/noLevel.html rename to L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00564_BasicMissionKartiasLabyrinthSolo/nolevel.html diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java index bf662a4210..d9452c94dc 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q00738_DimensionalExplorationOfTheUnworldlyVisitors.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; */ public class Q00738_DimensionalExplorationOfTheUnworldlyVisitors extends Quest { - private static final int START_NPC = 34360; + private static final int START_NPC = 34359; public Q00738_DimensionalExplorationOfTheUnworldlyVisitors() { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java index bf47669d49..fdb910e3fd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q10571_StrategicReconciliation.java @@ -24,7 +24,7 @@ import org.l2jmobius.gameserver.model.quest.Quest; */ public class Q10571_StrategicReconciliation extends Quest { - private static final int START_NPC = 34360; + private static final int START_NPC = 34359; public Q10571_StrategicReconciliation() { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18500-18599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18500-18599.xml index 8df20fa790..03290ec39f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18500-18599.xml +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/18500-18599.xml @@ -874,7 +874,7 @@ icon.nshop_bless_of_paagrio A1 - + 1500 2 @@ -920,10 +920,10 @@ -56633 -2776 - - 83378 - 147999 - -3400 + + 84015 + 147219 + -3395 72090