diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30008-3.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30008-3.html
index 50bed34d7f..f0f9c65a01 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30008-3.html
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30008-3.html
@@ -1,4 +1,5 @@
Grand Master Roien:
-Go to Talking Island Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+Go to the Talking Island Village and meet the Newbie Guide. He will teach you many useful things.
+Click on the question mark on the lower right and follow the arrow to meet the Newbie Guide. Well, good luck!
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30008-4.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30008-4.html
new file mode 100644
index 0000000000..50bed34d7f
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30008-4.html
@@ -0,0 +1,4 @@
+Grand Master Roien:
+Go to Talking Island Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30017-3.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30017-3.html
index ea89bb1fce..461406f937 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30017-3.html
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30017-3.html
@@ -1,4 +1,5 @@
Grand Magister Gallint:
-Go to Talking Island Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+Go to the Talking Island Village and meet the Newbie Guide. He will teach you many useful things.
+Click on the question mark on the lower right and follow the arrow to meet the Newbie Guide. Well, good luck!
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30017-4.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30017-4.html
new file mode 100644
index 0000000000..ea89bb1fce
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30017-4.html
@@ -0,0 +1,4 @@
+Grand Magister Gallint:
+Go to Talking Island Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30129-3.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30129-3.html
index ab78015333..5d6a660636 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30129-3.html
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30129-3.html
@@ -1,4 +1,5 @@
Dark Elf Chief Mithraell:
-Go to Dark Elf Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+Go to the Dark Elf Village and meet the Newbie Guide. He will teach you many useful things.
+Click on the question mark on the lower right and follow the arrow to meet the Newbie Guide. Well, good luck!
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30129-4.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30129-4.html
new file mode 100644
index 0000000000..ab78015333
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30129-4.html
@@ -0,0 +1,4 @@
+Dark Elf Chief Mithraell:
+Go to Dark Elf Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30370-3.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30370-3.html
index 9b9ab82387..f08060d2f6 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30370-3.html
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30370-3.html
@@ -1,4 +1,5 @@
Nerupa:
-Go to Elven Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+Go to the Elven Village and meet the Newbie Guide. He will teach you many useful things.
+Click on the question mark on the lower right and follow the arrow to meet the Newbie Guide. Well, good luck!
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30370-4.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30370-4.html
new file mode 100644
index 0000000000..9b9ab82387
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30370-4.html
@@ -0,0 +1,4 @@
+Nerupa:
+Go to Elven Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30528-3.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30528-3.html
index 3424293792..9f19dce403 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30528-3.html
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30528-3.html
@@ -1,4 +1,5 @@
Foreman Laferon:
-Go to Dwarven Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+Go to the Dwarven Village and meet the Newbie Guide. He will teach you many useful things.
+Click on the question mark on the lower right and follow the arrow to meet the Newbie Guide. Well, good luck!
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30528-4.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30528-4.html
new file mode 100644
index 0000000000..3424293792
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30528-4.html
@@ -0,0 +1,4 @@
+Foreman Laferon:
+Go to Dwarven Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30573-3.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30573-3.html
index 439035582f..94e0ef744d 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30573-3.html
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30573-3.html
@@ -1,4 +1,5 @@
Flame Guardian Vulkus:
-Go to Orc Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+Go to the Orc Village and meet the Newbie Guide. He will teach you many useful things.
+Click on the question mark on the lower right and follow the arrow to meet the Newbie Guide. Well, good luck!
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30573-4.html b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30573-4.html
new file mode 100644
index 0000000000..439035582f
--- /dev/null
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/30573-4.html
@@ -0,0 +1,4 @@
+Flame Guardian Vulkus:
+Go to Orc Village and meet the Newbie Guide. He will give you much important advice. He also has a gift for you.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
index 251d67ea29..6515a983b0 100644
--- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
+++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00255_Tutorial/Q00255_Tutorial.java
@@ -121,6 +121,9 @@ public class Q00255_Tutorial extends Quest
COMPLETE_LOCATION.put(53, new Location(115632, -177996, -905));
}
private static final String TUTORIAL_BUYPASS = "Quest Q00255_Tutorial ";
+ private static final int QUESTION_MARK_ID_1 = 1;
+ private static final int QUESTION_MARK_ID_2 = 5;
+ private static final int QUESTION_MARK_ID_3 = 28;
public Q00255_Tutorial()
{
@@ -169,7 +172,7 @@ public class Q00255_Tutorial extends Quest
{
if (qs.isMemoState(1))
{
- player.sendPacket(new TutorialShowQuestionMark(1, 0));
+ player.sendPacket(new TutorialShowQuestionMark(QUESTION_MARK_ID_1, 0));
player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML);
}
@@ -191,9 +194,7 @@ public class Q00255_Tutorial extends Quest
playTutorialVoice(player, "tutorial_voice_026");
}
htmltext = (npc != null ? npc.getId() : player.getTarget().getId()) + "-3.html";
- final int classId = player.getClassId().getId();
- addRadar(player, COMPLETE_LOCATION.get(classId).getX(), COMPLETE_LOCATION.get(classId).getY(), COMPLETE_LOCATION.get(classId).getZ());
- playSound(player, "ItemSound.quest_tutorial");
+ player.sendPacket(new TutorialShowQuestionMark(QUESTION_MARK_ID_3, 0));
}
break;
}
@@ -294,7 +295,7 @@ public class Q00255_Tutorial extends Quest
case 5:
case 6:
{
- return npc.getId() + "-3.html";
+ return npc.getId() + "-4.html";
}
}
}
@@ -336,7 +337,7 @@ public class Q00255_Tutorial extends Quest
qs.setMemoState(3);
playSound(player, "ItemSound.quest_tutorial");
playTutorialVoice(player, "tutorial_voice_013");
- player.sendPacket(new TutorialShowQuestionMark(1, 0));
+ player.sendPacket(new TutorialShowQuestionMark(QUESTION_MARK_ID_2, 0));
}
}
@@ -345,20 +346,41 @@ public class Q00255_Tutorial extends Quest
public void onPlayerPressTutorialMark(OnPlayerPressTutorialMark event)
{
final QuestState qs = getQuestState(event.getActiveChar(), false);
- if ((qs != null) && (event.getMarkId() == 1)) // tutorial mark
+ if (qs != null)
{
- if (qs.isMemoState(1))
+ switch (event.getMarkId())
{
- showOnScreenMsg(event.getActiveChar(), NpcStringId.SPEAK_WITH_THE_NEWBIE_HELPER, ExShowScreenMessage.TOP_CENTER, 5000);
- final int classId = event.getActiveChar().getClassId().getId();
- addRadar(event.getActiveChar(), HELPER_LOCATION.get(classId).getX(), HELPER_LOCATION.get(classId).getY(), HELPER_LOCATION.get(classId).getZ());
- showTutorialHtml(event.getActiveChar(), "tutorial_04.html");
- }
- else if (qs.isMemoState(3))
- {
- final int classId = event.getActiveChar().getClassId().getId();
- addRadar(event.getActiveChar(), HELPER_LOCATION.get(classId).getX(), HELPER_LOCATION.get(classId).getY(), HELPER_LOCATION.get(classId).getZ());
- showTutorialHtml(event.getActiveChar(), "tutorial_06.html");
+ case QUESTION_MARK_ID_1:
+ {
+ if (qs.isMemoState(1))
+ {
+ showOnScreenMsg(event.getActiveChar(), NpcStringId.SPEAK_WITH_THE_NEWBIE_HELPER, ExShowScreenMessage.TOP_CENTER, 5000);
+ final int classId = event.getActiveChar().getClassId().getId();
+ addRadar(event.getActiveChar(), HELPER_LOCATION.get(classId).getX(), HELPER_LOCATION.get(classId).getY(), HELPER_LOCATION.get(classId).getZ());
+ showTutorialHtml(event.getActiveChar(), "tutorial_04.html");
+ }
+ break;
+ }
+ case QUESTION_MARK_ID_2:
+ {
+ if (qs.isMemoState(3))
+ {
+ final int classId = event.getActiveChar().getClassId().getId();
+ addRadar(event.getActiveChar(), HELPER_LOCATION.get(classId).getX(), HELPER_LOCATION.get(classId).getY(), HELPER_LOCATION.get(classId).getZ());
+ showTutorialHtml(event.getActiveChar(), "tutorial_06.html");
+ }
+ break;
+ }
+ case QUESTION_MARK_ID_3:
+ {
+ if (qs.isMemoState(5))
+ {
+ final int classId = event.getActiveChar().getClassId().getId();
+ addRadar(event.getActiveChar(), COMPLETE_LOCATION.get(classId).getX(), COMPLETE_LOCATION.get(classId).getY(), COMPLETE_LOCATION.get(classId).getZ());
+ playSound(event.getActiveChar(), "ItemSound.quest_tutorial");
+ }
+ break;
+ }
}
}
}