BETA: Skills cleanup:

	* Removed old support for feedable beast in Beast Farm.
	* Removed custom CONFUSE_MOB_ONLY skillType.

L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java

@@ -203,7 +203,6 @@ import handlers.itemhandlers.SpiritShot;
 import handlers.itemhandlers.SummonItems;
 import handlers.itemhandlers.TeleportBookmark;
 import handlers.skillhandlers.BallistaBomb;
-import handlers.skillhandlers.BeastSkills;
 import handlers.skillhandlers.Continuous;
 import handlers.skillhandlers.DeluxeKey;
 import handlers.skillhandlers.Detection;
@@ -499,7 +498,6 @@ public class MasterHandler
 		{
 			// Skill Handlers
 			BallistaBomb.class,
-			BeastSkills.class,
 			Continuous.class,
 			DeluxeKey.class,
 			Detection.class,

L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/BeastSkills.java

@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2004-2013 L2J DataPack
- * 
- * This file is part of L2J DataPack.
- * 
- * L2J DataPack is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * L2J DataPack is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.skillhandlers;
-
-import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
-
-/**
- * @author _drunk_
- */
-public class BeastSkills implements ISkillHandler
-{
-	// private static Logger _log = Logger.getLogger(BeastSkills.class.getName());
-	private static final L2SkillType[] SKILL_IDS =
-	{
-		L2SkillType.BEAST_FEED,
-		L2SkillType.BEAST_RELEASE,
-		L2SkillType.BEAST_RELEASE_ALL,
-		L2SkillType.BEAST_SKILL,
-		L2SkillType.BEAST_ACCOMPANY
-	};
-	
-	@Override
-	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
-	{
-		if (!activeChar.isPlayer())
-		{
-			return;
-		}
-		
-		L2SkillType type = skill.getSkillType();
-		L2PcInstance player = activeChar.getActingPlayer();
-		L2Object target = player.getTarget();
-		
-		switch (type)
-		{
-			case BEAST_FEED:
-				L2Object[] targetList = skill.getTargetList(activeChar);
-				
-				if (targetList == null)
-				{
-					return;
-				}
-				
-				// This is just a dummy skill handler for the golden food and crystal food skills,
-				// since the AI responce onSkillUse handles the rest.
-				break;
-			case BEAST_RELEASE:
-				if ((target != null) && (target instanceof L2TamedBeastInstance))
-				{
-					((L2TamedBeastInstance) target).deleteMe();
-				}
-				break;
-			case BEAST_RELEASE_ALL:
-				if (player.getTrainedBeasts() != null)
-				{
-					for (L2TamedBeastInstance beast : player.getTrainedBeasts())
-					{
-						beast.deleteMe();
-					}
-				}
-				break;
-			case BEAST_ACCOMPANY:
-				// Unknown effect now
-				break;
-			case BEAST_SKILL:
-				if ((target != null) && (target instanceof L2TamedBeastInstance))
-				{
-					((L2TamedBeastInstance) target).castBeastSkills();
-				}
-				break;
-		}
-	}
-	
-	@Override
-	public L2SkillType[] getSkillIds()
-	{
-		return SKILL_IDS;
-	}
-}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java

@@ -48,7 +48,6 @@ public class Disablers implements ISkillHandler
 		L2SkillType.AGGREDUCE,
 		L2SkillType.AGGREDUCE_CHAR,
 		L2SkillType.AGGREMOVE,
-		L2SkillType.CONFUSE_MOB_ONLY,
 	};
 	
 	@Override
@@ -77,39 +76,6 @@ public class Disablers implements ISkillHandler
 			
 			switch (type)
 			{
-				case CONFUSE_MOB_ONLY:
-				{
-					// do nothing if not on mob
-					if (target.isL2Attackable())
-					{
-						if (Formulas.calcSkillSuccess(activeChar, target, skill, shld, ss, sps, bss))
-						{
-							for (L2Effect e : target.getAllEffects())
-							{
-								if (e.getSkill().getSkillType() == type)
-								{
-									e.exit();
-								}
-							}
-							skill.getEffects(activeChar, target, new Env(shld, ss, sps, bss));
-						}
-						else
-						{
-							if (activeChar.isPlayer())
-							{
-								SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RESISTED_YOUR_S2);
-								sm.addCharName(target);
-								sm.addSkillName(skill);
-								activeChar.sendPacket(sm);
-							}
-						}
-					}
-					else
-					{
-						activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
-					}
-					break;
-				}
 				case AGGDAMAGE:
 				{
 					if (target.isL2Attackable())

L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml

@@ -156,7 +156,6 @@
 		<set name="offensive" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="10000" />
-		<set name="skillType" val="CONFUSE_MOB_ONLY" />
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="Confusion" abnormalTime="20" val="0" effectPower="20" />
@@ -962,7 +961,6 @@
 		<set name="offensive" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="10000" />
-		<set name="skillType" val="CONFUSE_MOB_ONLY" />
 		<set name="targetType" val="ONE" />
 		<for>
 			<!-- FIXME: this shouldbe "Distrust" effect -->

L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml

@@ -261,7 +261,6 @@
 		<set name="offensive" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="5000" />
-		<set name="skillType" val="CONFUSE_MOB_ONLY" />
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="DERANGEMENT" />
 		<for>

L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml

@@ -1160,27 +1160,29 @@
 		<set name="targetType" val="SELF" />
 	</skill>
 	<skill id="2188" levels="1" name="Golden Spice">
+		<!-- Confirmed CT2.5 -->
 		<set name="castRange" val="40" />
-		<set name="effectRange" val="400" />
+		<set name="effectRange" val="200" />
 		<set name="hitTime" val="1000" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="6643" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="BEAST_FEED" />
+		<set name="reuseDelay" val="500" />
 		<set name="targetType" val="ONE" />
 	</skill>
 	<skill id="2189" levels="1" name="Crystal Spice">
+		<!-- Confirmed CT2.5 -->
 		<set name="castRange" val="40" />
-		<set name="effectRange" val="400" />
+		<set name="effectRange" val="200" />
 		<set name="hitTime" val="1000" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="itemConsumeId" val="6644" />
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="BEAST_FEED" />
+		<set name="reuseDelay" val="500" />
 		<set name="targetType" val="ONE" />
 	</skill>
 	<skill id="2190" levels="9" name="Item - Green Fish">

L2J_DataPack_BETA/dist/game/data/stats/skills/03500-03599.xml

@@ -1013,7 +1013,6 @@
 		<set name="magicLvl" val="80" />
 		<set name="offensive" val="true" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="CONFUSE_MOB_ONLY" />
 		<set name="targetType" val="ONE" />
 		<for>
 			<!-- FIXME: this should be "Distrust" effect -->

L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml

@@ -826,40 +826,35 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="8362" levels="1" name="Beast Training - Release">
-		<set name="castRange" val="40" />
-		<set name="effectRange" val="400" />
-		<set name="hitTime" val="500" />
+		<!-- Confirmed CT2.5 -->
+		<set name="castRange" val="900" />
+		<set name="effectRange" val="1200" />
 		<set name="icon" val="icon.skill8362" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
-		<set name="skillType" val="BEAST_RELEASE" />
 		<set name="targetType" val="ONE" />
 	</skill>
 	<skill id="8363" levels="1" name="Beast Training - Accompany">
-		<set name="castRange" val="40" />
-		<set name="effectRange" val="400" />
-		<set name="hitTime" val="500" />
+		<!-- Confirmed CT2.5 -->
+		<set name="affectRange" val="1000" />
 		<set name="icon" val="icon.skill8363" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
-		<set name="skillType" val="BEAST_ACCOMPANY" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="AURA" />
 	</skill>
 	<skill id="8364" levels="1" name="Beast Training - Use Special Ability">
-		<set name="castRange" val="40" />
-		<set name="effectRange" val="400" />
-		<set name="hitTime" val="500" />
+		<!-- Confirmed CT2.5 -->
+		<set name="affectRange" val="1000" />
 		<set name="icon" val="icon.skill8364" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
-		<set name="skillType" val="BEAST_SKILL" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="AURA" />
 	</skill>
 	<skill id="8365" levels="1" name="Dynasty Tunic">
 		<set name="icon" val="icon.armor_t93_ue_i00" />
@@ -1001,16 +996,14 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="8378" levels="1" name="Beast Training - Release All">
-		<set name="castRange" val="40" />
-		<set name="effectRange" val="400" />
-		<set name="hitTime" val="500" />
+		<!-- Confirmed CT2.5 -->
+		<set name="affectRange" val="1000" />
 		<set name="icon" val="icon.skill8378" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1000" />
-		<set name="skillType" val="BEAST_RELEASE_ALL" />
-		<set name="targetType" val="SELF" />
+		<set name="targetType" val="AURA" />
 	</skill>
 	<skill id="8379" levels="2" name="Royal Guard Ring - Gludio">
 		<table name="#earthRes"> 12 15 </table>