Changeset 5082

Timestamp:

Nov 15, 2011 5:30:52 AM (6 months ago)

Author:

Zoey76

Message:

LEGACY: Version of [5014] for CT2.5.
Note: Please do not use trac to report missing features for legacy chronicles (preferably for none of the chronicles, instead use forums).

Location:

branches/L2J_Server_CT2.5/java/com/l2jserver/gameserver

Files:

• model/L2SkillLearn.java (modified) (2 diffs)
• model/actor/instance/L2NpcInstance.java (modified) (6 diffs)
• model/actor/instance/L2PcInstance.java (modified) (1 diff)
• network/clientpackets/RequestAcquireSkill.java (modified) (5 diffs)
• network/clientpackets/RequestAcquireSkillInfo.java (modified) (2 diffs)

branches/L2J_Server_CT2.5/java/com/l2jserver/gameserver/model/L2SkillLearn.java

@@ -17 +17 @@
 import java.util.logging.Logger;
 
+import com.l2jserver.Config;
 import com.l2jserver.gameserver.templates.StatsSet;
+import com.l2jserver.gameserver.model.base.ClassId;
 import com.l2jserver.gameserver.model.base.Race;
 
@@ -265 +267 @@
                 return _learnedByFS;
         }
+        
+        /**
+         * Used for AltGameSkillLearn mod.<br>
+         * If the alternative skill learn system is enabled and the player is learning a skill from a different class apply a fee.<br>
+         * If the player is learning a skill from other class type (mage learning warrior skills or vice versa) the fee is higher.
+         * @param playerClass the player class Id.
+         * @param learningClass the skill learning player class Id.
+         * @return the amount of SP required to acquire this skill, by calculating the cost for the alternative skill learn system.
+         */
+        public int getCalculatedLevelUpSp(ClassId playerClass, ClassId learningClass)
+        {
+                if ((playerClass == null) || (learningClass == null))
+                {
+                        return _levelUpSp;
+                }
+                
+                int levelUpSp = _levelUpSp;
+                // If the alternative skill learn system is enabled and the player is learning a skill from a different class apply a fee.
+                if (Config.ALT_GAME_SKILL_LEARN && (playerClass != learningClass))
+                {
+                        // If the player is learning a skill from other class type (mage learning warrior skills or vice versa) the fee is higher.
+                        if (playerClass.isMage() != learningClass.isMage())
+                        {
+                                levelUpSp *= 3;
+                        }
+                        else
+                        {
+                                levelUpSp *= 2;
+                        }
+                }
+                return levelUpSp;
+        }
 }

branches/L2J_Server_CT2.5/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java

@@ -39 +39 @@
 public class L2NpcInstance extends L2Npc
 {
-        private final ClassId[] _classesToTeach;
-        
         public L2NpcInstance(int objectId, L2NpcTemplate template)
         {
@@ -46 +44 @@
                 setInstanceType(InstanceType.L2NpcInstance);
                 setIsInvul(false);
-                _classesToTeach = template.getTeachInfo();
         }
         
@@ -72 +69 @@
         public ClassId[] getClassesToTeach()
         {
-                return _classesToTeach;
+                return getTemplate().getTeachInfo();
         }
         
@@ -135 +132 @@
                 }
                 
-                if (((L2NpcInstance)npc).getClassesToTeach() == null)
+                if (((L2NpcInstance) npc).getClassesToTeach() == null)
                 {
                         NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
@@ -152 +149 @@
                 }
                 
-                //Normal skills, No LearnedByFS, no AutoGet skills.
+                // Normal skills, No LearnedByFS, no AutoGet skills.
                 final FastList<L2SkillLearn> skills = SkillTreesData.getInstance().getAvailableSkills(player, classId, false, false);
                 final AcquireSkillList asl = new AcquireSkillList(AcquireSkillList.SkillType.ClassTransform);
                 int count = 0;
                 
-                for (L2SkillLearn s: skills)
+                player.setLearningClass(classId);
+                for (L2SkillLearn s : skills)
                 {
-                        final L2Skill sk = SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel());
-                        if (sk != null)
+                        if (SkillTable.getInstance().getInfo(s.getSkillId(), s.getSkillLevel()) != null)
                         {
-                                asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getLevelUpSp(), 0);
+                                asl.addSkill(s.getSkillId(), s.getSkillLevel(), s.getSkillLevel(), s.getCalculatedLevelUpSp(player.getClassId(), classId), 0);
                                 count++;
                         }
@@ -180 +177 @@
                         else
                         {
-                                //TODO: Is this SysMsg really used here?
                                 if (player.getClassId().level() == 1)
                                 {

branches/L2J_Server_CT2.5/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -2609 +2609 @@
         }
         
-        /** Return the Experience of the L2PcInstance. */
-        public long getExp() { return getStat().getExp(); }
+        /**
+        * Used for AltGameSkillLearn to set a custom skill learning class Id.
+        */
+        private ClassId _learningClass = getClassId();
+        
+        /**
+        * @return the custom skill learning class Id.
+        */
+        public ClassId getLearningClass()
+        {
+                return _learningClass;
+        }
+        
+        /**
+        * @param learningClass the custom skill learning class Id to set.
+        */
+        public void setLearningClass(ClassId learningClass)
+        {
+                _learningClass = learningClass;
+        }
+        
+        /**
+         * @return the Experience of the L2PcInstance.
+         */
+        public long getExp()
+        { 
+                return getStat().getExp();
+        }
         
         public void setActiveEnchantAttrItem(L2ItemInstance stone)

branches/L2J_Server_CT2.5/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -153 +153 @@
                                 else
                                 {
-                                        final L2SkillLearn s = SkillTreesData.getInstance().getClassSkill(_id, _level, activeChar.getClassId());
+                                        final L2SkillLearn s = SkillTreesData.getInstance().getClassSkill(_id, _level, activeChar.getLearningClass());
                                         if (checkPlayerSkill(activeChar, trainer, s))
                                         {
@@ -412 +412 @@
          * @param trainer the skills teaching Npc.
          * @param s the skill to be learn.
+         * @return {@code true} if all requirements are meet, {@code false} otherwise.
          */
         private boolean checkPlayerSkill(L2PcInstance player, L2Npc trainer, L2SkillLearn s)
@@ -422 +423 @@
                                 if (s.getGetLevel() > player.getLevel())
                                 {
-                                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_MEET_SKILL_LEVEL_REQUIREMENTS));
+                                        player.sendPacket(SystemMessageId.YOU_DONT_MEET_SKILL_LEVEL_REQUIREMENTS);
                                         Util.handleIllegalPlayerAction(player, "Player " + player.getName() + ", level " + player.getLevel() + " is requesting skill Id: " + _id + " level " + _level + " without having minimum required level, " + s.getGetLevel() + "!", 0);
                                         return false;
                                 }
                                 
-                                //First it checks that the skill require SP and the player has enough SP to learn it.
-                                final int levelUpSp = s.getLevelUpSp();
+                                // First it checks that the skill require SP and the player has enough SP to learn it.
+                                final int levelUpSp = s.getCalculatedLevelUpSp(player.getClassId(), player.getLearningClass());
                                 if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
                                 {
-                                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_ENOUGH_SP_TO_LEARN_SKILL));
+                                        player.sendPacket(SystemMessageId.NOT_ENOUGH_SP_TO_LEARN_SKILL);
                                         showSkillList(trainer, player);
                                         return false;
@@ -452 +453 @@
                                                 {
                                                         //Player doesn't have required item.
-                                                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ITEM_MISSING_TO_LEARN_SKILL));
+                                                        player.sendPacket(SystemMessageId.ITEM_MISSING_TO_LEARN_SKILL);
                                                         showSkillList(trainer, player);
                                                         return false;
@@ -556 +557 @@
                 else
                 {
-                        L2NpcInstance.showSkillList(player, trainer, player.getClassId());
+                        L2NpcInstance.showSkillList(player, trainer, player.getLearningClass());
                 }
         }

branches/L2J_Server_CT2.5/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkillInfo.java

@@ -100 +100 @@
                                 {
                                         final L2SkillLearn s = SkillTreesData.getInstance().getTransformSkill(_id, _level);
-                                        
                                         if (s != null)
                                         {
@@ -125 +124 @@
                                         return;
                                 }
-                                else if (trainer.getTemplate().canTeach(activeChar.getClassId()))
-                                {
-                                        final L2SkillLearn s = SkillTreesData.getInstance().getClassSkill(_id, _level, activeChar.getClassId());
+                                else if (trainer.getTemplate().canTeach(activeChar.getLearningClass()))
+                                {
+                                        final L2SkillLearn s = SkillTreesData.getInstance().getClassSkill(_id, _level, activeChar.getLearningClass());
                                         if (s != null)
                                         {
                                                 int itemId = -1;
                                                 int itemCount = -1;
-                                                final int levelUpSp = s.getLevelUpSp();
-                                                
+                                                final int levelUpSp = s.getCalculatedLevelUpSp(activeChar.getClassId(), activeChar.getLearningClass());
                                                 final AcquireSkillInfo asi = new AcquireSkillInfo(_id, _level, levelUpSp, SkillType.ClassTransform);