BETA: Core-part for ​[DP9580].

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -1642,7 +1642,6 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 			case PARTY:
 			case CLAN:
 			case PARTY_CLAN:
-			case ALLY:
 				doit = true;
 			default:
 				if (targets.length == 0)
@@ -8126,4 +8125,14 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 	{
 		globalSkillUseListeners.remove(listener);
 	}
+	
+	public int getClanId()
+	{
+		return 0;
+	}
+	
+	public int getAllyId()
+	{
+		return 0;
+	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -728,7 +728,7 @@ public abstract class L2Summon extends L2Playable
 				}
 				
 				// Check if a Forced attack is in progress on non-attackable target
-				if (!target.isAutoAttackable(this) && !forceUse && !target.isNpc() && (skill.getTargetType() != L2TargetType.AURA) && (skill.getTargetType() != L2TargetType.FRONT_AURA) && (skill.getTargetType() != L2TargetType.BEHIND_AURA) && (skill.getTargetType() != L2TargetType.CLAN) && (skill.getTargetType() != L2TargetType.ALLY) && (skill.getTargetType() != L2TargetType.PARTY) && (skill.getTargetType() != L2TargetType.SELF))
+				if (!target.isAutoAttackable(this) && !forceUse && !target.isNpc() && (skill.getTargetType() != L2TargetType.AURA) && (skill.getTargetType() != L2TargetType.FRONT_AURA) && (skill.getTargetType() != L2TargetType.BEHIND_AURA) && (skill.getTargetType() != L2TargetType.CLAN) && (skill.getTargetType() != L2TargetType.PARTY) && (skill.getTargetType() != L2TargetType.SELF))
 				{
 					return false;
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -3192,6 +3192,7 @@ public final class L2PcInstance extends L2Playable
 	/**
 	 * @return the Clan Identifier of the L2PcInstance.
 	 */
+	@Override
 	public int getClanId()
 	{
 		return _clanId;
@@ -4884,6 +4885,7 @@ public final class L2PcInstance extends L2Playable
 	/**
 	 * @return the Alliance Identifier of the L2PcInstance.
 	 */
+	@Override
 	public int getAllyId()
 	{
 		if (_clan == null)
@@ -9390,7 +9392,6 @@ public final class L2PcInstance extends L2Playable
 			case FRONT_AURA:
 			case BEHIND_AURA:
 			case PARTY:
-			case ALLY:
 			case CLAN:
 			case PARTY_CLAN:
 			case GROUND:
@@ -9570,8 +9571,6 @@ public final class L2PcInstance extends L2Playable
 					case BEHIND_AURA:
 					case AURA_CORPSE_MOB:
 					case CLAN:
-					case PARTY_CLAN:
-					case ALLY:
 					case PARTY:
 					case SELF:
 					case GROUND:
@@ -9655,7 +9654,6 @@ public final class L2PcInstance extends L2Playable
 				case PARTY_CLAN:
 				case SELF:
 				case PARTY:
-				case ALLY:
 				case CORPSE_MOB:
 				case AREA_CORPSE_MOB:
 				case GROUND:
@@ -9681,7 +9679,6 @@ public final class L2PcInstance extends L2Playable
 		switch (sklTargetType)
 		{
 			case PARTY:
-			case ALLY: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
 			case CLAN: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
 			case PARTY_CLAN: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
 			case AURA:

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -69,6 +69,7 @@ import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.Rnd;
 
 public abstract class L2Skill implements IChanceSkillTrigger
 {
@@ -254,8 +255,6 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	
 	private L2ExtractableSkill _extractableItems = null;
 	
-	private final int _maxTargets;
-	
 	private int _npcId = 0;
 	
 	private byte[] _effectTypes;
@@ -506,7 +505,6 @@ public abstract class L2Skill implements IChanceSkillTrigger
 			
 			_extractableItems = parseExtractableSkill(_id, _level, capsuled_items);
 		}
-		_maxTargets = set.getInteger("maxTargets", -1);
 		_npcId = set.getInteger("npcId", 0);
 	}
 	
@@ -977,9 +975,9 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		return _affectRange;
 	}
 	
-	public final int[] getAffectLimit()
+	public final int getAffectLimit()
 	{
-		return _affectLimit;
+		return (_affectLimit[0] + Rnd.get(_affectLimit[1]));
 	}
 	
 	public final boolean isActive()
@@ -2002,11 +2000,6 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		return _extractableItems;
 	}
 	
-	public int getMaxTargets()
-	{
-		return _maxTargets;
-	}
-	
 	/**
 	 * @return the _npcId
 	 */

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/targets/L2TargetType.java

@@ -23,7 +23,6 @@ package com.l2jserver.gameserver.model.skills.targets;
  */
 public enum L2TargetType
 {
-	ALLY,
 	AREA,
 	AREA_CORPSE_MOB,
 	AREA_FRIENDLY,
@@ -36,7 +35,6 @@ public enum L2TargetType
 	CLAN,
 	CLAN_MEMBER,
 	CORPSE,
-	CORPSE_ALLY,
 	CORPSE_CLAN,
 	CORPSE_MOB,
 	CORPSE_PET,