Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/skillhandlers/Extractable.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/handlers/skillhandlers/Extractable.java (modified) (5 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/skillhandlers/Extractable.java

@@ -25 +25 @@
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
-import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
 /**
- * @author Zoey76, based on previous version.
+ * @author Zoey76
  */
 public class Extractable implements ISkillHandler
 {
-        //FIXME: Remove this once skill reuse will be global for main/subclass.
-        private static final int[] protectedSkillIds = { 323, 324, 419, 519, 520, 620, 1324, 1387 };
-        
         private static final L2SkillType[] SKILL_TYPES =
         {
@@ -44 +39 @@
         };
         
+        @Override
         public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
         {
@@ -51 +47 @@
                 }
                 
-                L2ExtractableSkill exItem = skill.getExtractableSkill();
-                
+                final L2ExtractableSkill exItem = skill.getExtractableSkill();
                 if (exItem == null)
                 {
@@ -102 +97 @@
                 }
                 
-                L2PcInstance player = (L2PcInstance) activeChar;
-                
-                //FIXME: Remove this once skill reuse will be global for main/subclass.
-                if (player.isSubClassActive() && (skill.getReuseDelay() > 0) && !Util.contains(protectedSkillIds, skill.getId()))
+                final L2PcInstance player = activeChar.getActingPlayer();
+                if (createItemID[0] <= 0)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MAIN_CLASS_SKILL_ONLY));
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED).addSkillName(skill));
+                        player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
                         return;
                 }
                 
-                if (createItemID[0] <= 0)
+                for (int i = 0; i < createItemID.length; i++)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_INSIDE_THAT));
-                        return;
-                }
-                else
-                {
-                        for (int i = 0; i < createItemID.length; i++)
+                        if (createItemID[i] <= 0)
                         {
-                                if (createItemID[i] <= 0)
+                                continue;
+                        }
+                        
+                        if (ItemTable.getInstance().createDummyItem(createItemID[i]) == null)
+                        {
+                                _log.warning("Extractable Item Skill Id:" + skill.getId() + " createItemID " + createItemID[i] + " doesn't have a template!");
+                                player.sendPacket(SystemMessageId.NOTHING_INSIDE_THAT);
+                                return;
+                        }
+                        
+                        if (ItemTable.getInstance().createDummyItem(createItemID[i]).isStackable())
+                        {
+                                player.addItem("Extract", createItemID[i], createAmount[i], targets[0], true);
+                        }
+                        else
+                        {
+                                for (int j = 0; j < createAmount[i]; j++)
                                 {
-                                        continue;
-                                }
-                                
-                                if (ItemTable.getInstance().createDummyItem(createItemID[i]) == null)
-                                {
-                                        _log.warning("Extractable Item Skill Id:" + skill.getId() + " createItemID " + createItemID[i] + " doesn't have a template!");
-                                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOTHING_INSIDE_THAT));
-                                        return;
-                                }
-                                
-                                if (ItemTable.getInstance().createDummyItem(createItemID[i]).isStackable())
-                                {
-                                        player.addItem("Extract", createItemID[i], createAmount[i], targets[0], false);
-                                }
-                                else
-                                {
-                                        for (int j = 0; j < createAmount[i]; j++)
-                                        {
-                                                player.addItem("Extract", createItemID[i], 1, targets[0], false);
-                                        }
-                                }
-                                
-                                if (createItemID[i] == 57)
-                                {
-                                        SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);;
-                                        sm.addNumber(createAmount[i]);
-                                        player.sendPacket(sm);
-                                }
-                                else
-                                {
-                                        SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);;
-                                        sm.addItemName(createItemID[i]);
-                                        if (createAmount[i] > 1)
-                                        {
-                                                sm.addNumber(createAmount[i]);
-                                        }
-                                        player.sendPacket(sm);
+                                        player.addItem("Extract", createItemID[i], 1, targets[0], true);
                                 }
                         }
@@ -165 +132 @@
         }
         
+        @Override
         public L2SkillType[] getSkillIds()
         {