Advertisement
REALAPROX

class-change-prompt

May 8th, 2023 (edited)
195
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 9.10 KB | Gaming | 0 0
  1. ### Eclipse Workspace Patch 1.0
  2. #P L2J_Mobius_10.3_MasterClass
  3. diff --git dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
  4. index dde2731..60988ec 100644
  5. --- dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
  6. +++ dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
  7. @@ -168,7 +168,10 @@
  8. if (CategoryData.getInstance().isInCategory(CategoryType.FIRST_CLASS_GROUP, player.getClassId().getId()) && (player.getRace() != Race.ERTHEIA))
  9. {
  10. showOnScreenMsg(player, NpcStringId.CLASS_TRANSFER_IS_AVAILABLE_CLICK_THE_CLASS_TRANSFER_ICON_IN_THE_NOTIFICATION_WINDOW_TO_TRANSFER_YOUR_CLASS, ExShowScreenMessage.TOP_CENTER, 10000);
  11. - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  12. + if (player.canChangeClass(player))
  13. + {
  14. + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  15. + }
  16. }
  17. final Quest nextQuest = QuestManager.getInstance().getQuest(Q11025_PathOfDestinyProving.class.getSimpleName());
  18. if (nextQuest != null)
  19. @@ -430,8 +433,7 @@
  20.  
  21. if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
  22. {
  23. - final boolean canChangeClass = player.canChangeClass(player);
  24. - if (canChangeClass)
  25. + if (player.canChangeClass(player))
  26. {
  27. player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  28. }
  29. diff --git dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
  30. index 5d9caef..1f7993d 100644
  31. --- dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
  32. +++ dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java
  33. @@ -287,7 +287,10 @@
  34. if (CategoryData.getInstance().isInCategory(CategoryType.SECOND_CLASS_GROUP, player.getClassId().getId()))
  35. {
  36. showOnScreenMsg(player, NpcStringId.CLASS_TRANSFER_IS_AVAILABLE_CLICK_THE_CLASS_TRANSFER_ICON_IN_THE_NOTIFICATION_WINDOW_TO_TRANSFER_YOUR_CLASS, ExShowScreenMessage.TOP_CENTER, 10000);
  37. - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  38. + if (player.canChangeClass(player))
  39. + {
  40. + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  41. + }
  42. }
  43. htmltext = event;
  44. }
  45. @@ -796,7 +799,10 @@
  46.  
  47. if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
  48. {
  49. - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  50. + if (player.canChangeClass(player))
  51. + {
  52. + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  53. + }
  54. }
  55. }
  56. }
  57. diff --git dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
  58. index 4a31dde..ae4bf11 100644
  59. --- dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
  60. +++ dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java
  61. @@ -300,7 +300,10 @@
  62. if (CategoryData.getInstance().isInCategory(CategoryType.THIRD_CLASS_GROUP, player.getClassId().getId()) || (CategoryData.getInstance().isInCategory(CategoryType.SECOND_CLASS_GROUP, player.getClassId().getId()) && (player.getRace() == Race.ERTHEIA)))
  63. {
  64. showOnScreenMsg(player, NpcStringId.CLASS_TRANSFER_IS_AVAILABLE_CLICK_THE_CLASS_TRANSFER_ICON_IN_THE_NOTIFICATION_WINDOW_TO_TRANSFER_YOUR_CLASS, ExShowScreenMessage.TOP_CENTER, 10000);
  65. - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  66. + if (player.canChangeClass(player))
  67. + {
  68. + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  69. + }
  70. }
  71. htmltext = event;
  72. }
  73. @@ -668,7 +671,10 @@
  74. final QuestState qs = getQuestState(player, false);
  75. if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
  76. {
  77. - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  78. + if (player.canChangeClass(player))
  79. + {
  80. + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  81. + }
  82. }
  83. }
  84. }
  85. diff --git dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
  86. index 1b4823b..fe729f3 100644
  87. --- dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
  88. +++ dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java
  89. @@ -370,7 +370,10 @@
  90. if (CategoryData.getInstance().isInCategory(CategoryType.FOURTH_CLASS_GROUP, player.getClassId().getId()) || (CategoryData.getInstance().isInCategory(CategoryType.THIRD_CLASS_GROUP, player.getClassId().getId()) && (player.getRace() == Race.ERTHEIA)))
  91. {
  92. showOnScreenMsg(player, NpcStringId.CLASS_TRANSFER_IS_AVAILABLE_CLICK_THE_CLASS_TRANSFER_ICON_IN_THE_NOTIFICATION_WINDOW_TO_TRANSFER_YOUR_CLASS, ExShowScreenMessage.TOP_CENTER, 10000);
  93. - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  94. + if (player.canChangeClass(player))
  95. + {
  96. + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  97. + }
  98. }
  99. htmltext = event;
  100. }
  101. @@ -870,7 +873,10 @@
  102. final QuestState qs = getQuestState(player, false);
  103. if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
  104. {
  105. - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  106. + if (player.canChangeClass(player))
  107. + {
  108. + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  109. + }
  110. }
  111. }
  112. }
  113. diff --git java/org/l2jmobius/gameserver/model/actor/Player.java java/org/l2jmobius/gameserver/model/actor/Player.java
  114. index 4b5bcd8..3360b46 100644
  115. --- java/org/l2jmobius/gameserver/model/actor/Player.java
  116. +++ java/org/l2jmobius/gameserver/model/actor/Player.java
  117. @@ -15257,4 +15257,15 @@
  118. addValue = addValue >= 1 ? addValue : 1;
  119. return addValue;
  120. }
  121. +
  122. + public boolean canChangeClass(Player player)
  123. + {
  124. + final int playerLevel = player.getLevel();
  125. + boolean changeAllowed = false;
  126. + if ((player.isInCategory(CategoryType.FIRST_CLASS_GROUP) && (playerLevel >= 18)) || (player.isInCategory(CategoryType.SECOND_CLASS_GROUP) && (playerLevel >= 38)) || (player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && (playerLevel >= 76)) || (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (playerLevel >= 85)))
  127. + {
  128. + changeAllowed = true;
  129. + }
  130. + return changeAllowed;
  131. + }
  132. }
  133. diff --git java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
  134. index 080b56ee..2761fb0 100644
  135. --- java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
  136. +++ java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java
  137. @@ -296,9 +296,7 @@
  138. // getActiveChar().sendPacket(new ExOneDayReceiveRewardList(getActiveChar(), true));
  139.  
  140. // trying to run a script to check and prompt for available class changes on level-up
  141. - final boolean canChangeClass = getActiveChar().canChangeClass(getActiveChar());
  142. - getActiveChar().sendMessage("_classId = " + getActiveChar().getClassId());
  143. - if (canChangeClass)
  144. + if (getActiveChar().canChangeClass(getActiveChar()))
  145. {
  146. getActiveChar().sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  147. }
  148. diff --git java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
  149. index 3744878..52669ab 100644
  150. --- java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
  151. +++ java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
  152. @@ -175,10 +175,7 @@
  153. player.sendSkillList();
  154. player.sendPacket(new PlaySound("ItemSound.quest_fanfare_2"));
  155.  
  156. - if (Config.DISABLE_TUTORIAL && !player.isInCategory(CategoryType.SIXTH_CLASS_GROUP) //
  157. - && ((player.isInCategory(CategoryType.SECOND_CLASS_GROUP) && (playerLevel >= 38)) //
  158. - || (player.isInCategory(CategoryType.THIRD_CLASS_GROUP) && (playerLevel >= 76)) //
  159. - || (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && (playerLevel >= 85))))
  160. + if (Config.DISABLE_TUTORIAL && player.canChangeClass(player))
  161. {
  162. player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  163. }
  164. diff --git java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
  165. index 2388725..2a71ae2 100644
  166. --- java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
  167. +++ java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
  168. @@ -86,7 +86,10 @@
  169. }
  170. }
  171.  
  172. - player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  173. + if (player.canChangeClass(player))
  174. + {
  175. + player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
  176. + }
  177. }
  178.  
  179. private boolean firstClassCheck(Player player)
  180.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement