소스 검색

BETA: Improvements to system messages related to skill learning process.

Reported by: MELERIX, lion
Patch by: UnAfraid
Reviewed by: Zoey76
Zoey76 12 년 전
부모
커밋
e7c993235d

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -1684,7 +1684,7 @@ public final class SystemMessageId
 	 * ID: 276<br>
 	 * Message: You do not have the necessary materials or prerequisites to learn this skill.
 	 */
-	public static final SystemMessageId ITEM_MISSING_TO_LEARN_SKILL;
+	public static final SystemMessageId ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL;
 	
 	/**
 	 * ID: 277<br>
@@ -15271,7 +15271,7 @@ public final class SystemMessageId
 		CLAN_LVL_3_NEEDED_TO_DECLARE_WAR = new SystemMessageId(273);
 		CLAN_LEVEL_INCREASED = new SystemMessageId(274);
 		CLAN_LEVEL_INCREASE_FAILED = new SystemMessageId(275);
-		ITEM_MISSING_TO_LEARN_SKILL = new SystemMessageId(276);
+		ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL = new SystemMessageId(276);
 		LEARNED_SKILL_S1 = new SystemMessageId(277);
 		NOT_ENOUGH_SP_TO_LEARN_SKILL = new SystemMessageId(278);
 		YOU_NOT_ENOUGH_ADENA = new SystemMessageId(279);

+ 5 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -182,7 +182,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 							if (!activeChar.destroyItemByItemId("Consume", item.getId(), item.getCount(), trainer, false))
 							{
 								// Doesn't have required item.
-								activeChar.sendPacket(SystemMessageId.ITEM_MISSING_TO_LEARN_SKILL);
+								activeChar.sendPacket(SystemMessageId.ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
 								L2VillageMasterInstance.showPledgeSkillList(activeChar);
 								return;
 							}
@@ -249,7 +249,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 					{
 						if (!activeChar.destroyItemByItemId("SubSkills", item.getId(), item.getCount(), trainer, false))
 						{
-							activeChar.sendPacket(SystemMessageId.ITEM_MISSING_TO_LEARN_SKILL);
+							activeChar.sendPacket(SystemMessageId.ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
 							return;
 						}
 						
@@ -349,7 +349,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 				}
 				
 				// Player doesn't have required item.
-				activeChar.sendPacket(SystemMessageId.ITEM_MISSING_TO_LEARN_SKILL);
+				activeChar.sendPacket(SystemMessageId.ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
 				showSkillList(trainer, activeChar);
 				break;
 			}
@@ -419,8 +419,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 							}
 							else
 							{
-								// TODO: Find retail message.
-								player.sendMessage("You must learn the " + skill.getSkill().getName() + " skill before you can acquire further skills.");
+								player.sendPacket(SystemMessageId.ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
 							}
 							return false;
 						}
@@ -438,7 +437,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 						if (reqItemCount < item.getCount())
 						{
 							// Player doesn't have required item.
-							player.sendPacket(SystemMessageId.ITEM_MISSING_TO_LEARN_SKILL);
+							player.sendPacket(SystemMessageId.ITEM_OR_PREREQUISITES_MISSING_TO_LEARN_SKILL);
 							showSkillList(trainer, player);
 							return false;
 						}