Classmasters rework.

This commit is contained in:
MobiusDev
2017-08-02 12:48:49 +00:00
parent be341e760c
commit 0530bbeb53
39 changed files with 544 additions and 317 deletions

View File

@@ -216,7 +216,7 @@ public abstract class LetterQuest extends Quest
if ((st == null) && (event.getOldLevel() < event.getNewLevel()) && canStartQuest(player))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
showOnScreenMsg(player, _startMessage, ExShowScreenMessage.TOP_CENTER, 10000);
}
@@ -236,7 +236,7 @@ public abstract class LetterQuest extends Quest
if ((st == null) && canStartQuest(player))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
showOnScreenMsg(player, _startMessage, ExShowScreenMessage.TOP_CENTER, 10000);
}

View File

@@ -367,7 +367,7 @@ public final class Q00128_PailakaSongOfIceAndFire extends Quest
if ((oldLevel < newLevel) && (newLevel == MIN_LEVEL))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
}
}

View File

@@ -144,7 +144,7 @@ public final class Q00386_StolenDignity extends Quest
playSound(player, QuestSound.ITEMSOUND_QUEST_ACCEPT);
qs.setMemoState(336);
qs.startQuest();
player.sendPacket(new TutorialShowQuestionMark(336));
player.sendPacket(new TutorialShowQuestionMark(336, 1)); // why not getId() ?
playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE);
return "30843-05.htm";
}

View File

@@ -252,7 +252,7 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
if ((qs == null) && (event.getOldLevel() < event.getNewLevel()) && canStartQuest(player))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
}
}
@@ -271,7 +271,7 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
if ((qs == null) && canStartQuest(player))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
}
}

View File

@@ -288,7 +288,7 @@ public class Q10304_ForForgottenHeroes extends Quest
final QuestState qs = getQuestState(player, false);
if ((qs == null) && (event.getOldLevel() < event.getNewLevel()) && canStartQuest(player) && (player.getLevel() >= MIN_LEVEL))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
}
}
@@ -301,7 +301,7 @@ public class Q10304_ForForgottenHeroes extends Quest
final QuestState qs = getQuestState(player, false);
if ((qs == null) && canStartQuest(player) && (player.getLevel() >= MIN_LEVEL))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
}
}

View File

@@ -474,7 +474,7 @@ public final class Q10331_StartOfFate extends Quest
if ((qs == null) && (oldLevel < newLevel) && (newLevel == MIN_LEVEL) && (player.getRace() != Race.ERTHEIA) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP)))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
}
}
@@ -488,7 +488,7 @@ public final class Q10331_StartOfFate extends Quest
if ((qs == null) && (player.getRace() != Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP)))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
}
}

View File

@@ -506,7 +506,7 @@ public final class Q10360_CertificationOfFate extends Quest
if ((oldLevel < newLevel) && (newLevel == MIN_LEVEL) && (player.getRace() != Race.ERTHEIA) && (player.isInCategory(CategoryType.SECOND_CLASS_GROUP)))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
}
}
@@ -522,7 +522,7 @@ public final class Q10360_CertificationOfFate extends Quest
final QuestState st = getQuestState(player, true);
if (st.isCreated())
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
}
}
}

View File

@@ -520,7 +520,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest
else if (command.equals("Q10751_close"))
{
player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML);
}
}
@@ -538,7 +538,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest
if ((st == null) && (player.getRace().equals(Race.ERTHEIA)) && (oldLevel < newLevel) && (newLevel >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP)))
{
showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000);
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
}
}
@@ -552,7 +552,7 @@ public final class Q10751_WindsOfFateEncounters extends Quest
if ((st == null) && player.getRace().equals(Race.ERTHEIA) && (player.getLevel() >= MIN_LEVEL) && (player.isInCategory(CategoryType.FIRST_CLASS_GROUP)))
{
showOnScreenMsg(player, NpcStringId.QUEEN_NAVARI_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000);
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
}
}
}

View File

@@ -522,7 +522,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest
else if (command.equals("Q10752_close"))
{
player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML);
}
}
@@ -552,7 +552,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest
{
showOnScreenMsg(player, NpcStringId.MASTER_KATALIN_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000);
}
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
}
}
@@ -578,7 +578,7 @@ public final class Q10752_WindsOfFateAPromise extends Quest
{
showOnScreenMsg(player, NpcStringId.MASTER_KATALIN_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000);
}
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
}
}
}

View File

@@ -748,7 +748,7 @@ public final class Q10753_WindsOfFateChoices extends Quest
else if (command.equals("Q10753_close"))
{
player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
player.clearHtmlActions(HtmlActionScope.TUTORIAL_HTML);
}
}
@@ -778,7 +778,7 @@ public final class Q10753_WindsOfFateChoices extends Quest
{
showOnScreenMsg(player, NpcStringId.MASTER_KATALIN_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000);
}
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
}
}
@@ -805,7 +805,7 @@ public final class Q10753_WindsOfFateChoices extends Quest
{
showOnScreenMsg(player, NpcStringId.MASTER_KATALIN_HAS_SENT_A_LETTER_NCLICK_THE_QUESTION_MARK_ICON_TO_READ, ExShowScreenMessage.TOP_CENTER, 10000);
}
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
playSound(player, QuestSound.ITEMSOUND_QUEST_TUTORIAL);
}
}

View File

@@ -357,7 +357,7 @@ public abstract class ThirdClassTransferQuest extends Quest
if ((oldLevel < newLevel) && (newLevel == _minLevel) && (player.getRace() == _race) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP)))
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1));
}
}
@@ -374,9 +374,10 @@ public abstract class ThirdClassTransferQuest extends Quest
if ((player.getLevel() >= _minLevel) && (player.getRace() == _race) && (player.isInCategory(CategoryType.THIRD_CLASS_GROUP)))
{
if (getQuestState(player, true).isCreated())
final QuestState qs = getQuestState(player, true);
if (qs.isCreated())
{
player.sendPacket(new TutorialShowQuestionMark(getId()));
player.sendPacket(new TutorialShowQuestionMark(getId(), 1)); // Seems not to work. - blank text
}
}
}