lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabling tutorial configuration enables class change alarm.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-04 22:19:42 +00:00
parent 552680c628
commit be1cac7e42
62 changed files with 232 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java vendored
View File

@@ -408,13 +408,8 @@ public class Q11024_PathOfDestinyBeginning extends Quest
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLogin(OnPlayerLogin event)
public void onPlayerLogin(OnPlayerLogin event)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = event.getPlayer();
if (player == null)
{
@@ -422,7 +417,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs == null) || (player.getLevel() < 20))
if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
{
showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
return;
@@ -433,7 +428,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
return;
}
if (qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java vendored
View File

@@ -773,13 +773,8 @@ public class Q11025_PathOfDestinyProving extends Quest
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLogin(OnPlayerLogin event)
public void onPlayerLogin(OnPlayerLogin event)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = event.getPlayer();
if (player == null)
{
@@ -792,7 +787,7 @@ public class Q11025_PathOfDestinyProving extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java vendored
View File

@@ -652,13 +652,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLogin(OnPlayerLogin event)
public void onPlayerLogin(OnPlayerLogin event)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = event.getPlayer();
if (player == null)
{
@@ -671,7 +666,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

18
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java vendored
View File

@@ -325,13 +325,10 @@ public class Q11027_PathOfDestinyOvercome extends Quest
}
case "34505-10.html":
{
if (player.getLevel() >= LEVEL_85)
if ((player.getLevel() >= LEVEL_85) && qs.isCond(19))
{
if (qs.isCond(19))
{
qs.setCond(20, true);
htmltext = event;
}
qs.setCond(20, true);
htmltext = event;
}
break;
}
@@ -857,13 +854,8 @@ public class Q11027_PathOfDestinyOvercome extends Quest
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLogin(OnPlayerLogin event)
public void onPlayerLogin(OnPlayerLogin event)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = event.getPlayer();
if (player == null)
{
@@ -876,7 +868,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

25
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
View File

@@ -42,11 +42,6 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
@Override
public void run(GameClient client)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = client.getPlayer();
if (player == null)
{
@@ -97,24 +92,44 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
private boolean firstClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
final QuestState qs = player.getQuestState("Q11024_PathOfDestinyBeginning");
return (qs != null) && qs.isCompleted();
}
private boolean secondClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
final QuestState qs = player.getQuestState("Q11025_PathOfDestinyProving");
return (qs != null) && qs.isCompleted();
}
private boolean thirdClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
final QuestState qs = player.getQuestState("Q11026_PathOfDestinyConviction");
return (qs != null) && qs.isCompleted();
}
private boolean fourthClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
final QuestState qs = player.getQuestState("Q11027_PathOfDestinyOvercome");
return (qs != null) && qs.isCompleted();
}