BETA: Renamed ''`NpcKill`'' effect to ''`Unsummon`''.

    * Implemented retail like chance checks for ''`Unsummon`'' effect.
    * Reviewed By: Zoey76, !UnAfraid

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

@@ -123,7 +123,7 @@ public final class EffectMasterHandler
 		MpConsumePerLevel.class,
 		Mute.class,
 		NoblesseBless.class,
-		NpcKill.class,
+		Unsummon.class,
 		OpenCommonRecipeBook.class,
 		OpenDwarfRecipeBook.class,
 		Paralyze.class,

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/NpcKill.java → L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Unsummon.java

@@ -20,22 +20,26 @@ package handlers.effecthandlers;
 
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2SiegeSummonInstance;
 import com.l2jserver.gameserver.model.effects.EffectTemplate;
 import com.l2jserver.gameserver.model.effects.L2Effect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.stats.Env;
+import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.util.Rnd;
 
 /**
- * Npc Kill effect implementation.
+ * Unsummon effect implementation.
  * @author Adry_85
  */
-public class NpcKill extends L2Effect
+public class Unsummon extends L2Effect
 {
-	public NpcKill(Env env, EffectTemplate template)
+	private final int _chance;
+	
+	public Unsummon(Env env, EffectTemplate template)
 	{
 		super(env, template);
+		_chance = template.hasParameters() ? template.getParameters().getInt("chance", 100) : 100;
 	}
 	
 	@Override
@@ -50,10 +54,26 @@ public class NpcKill extends L2Effect
 		return true;
 	}
 	
+	@Override
+	public boolean calcSuccess()
+	{
+		int magicLevel = getSkill().getMagicLevel();
+		if ((magicLevel <= 0) || ((getEffected().getLevel() - 9) <= magicLevel))
+		{
+			double chance = _chance * Formulas.calcAttributeBonus(getEffector(), getEffected(), getSkill()) * Formulas.calcGeneralTraitBonus(getEffector(), getEffected(), getSkill().getTraitType(), false);
+			if (chance > (Rnd.nextDouble() * 100))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
 	@Override
 	public boolean onStart()
 	{
-		if ((getEffected() instanceof L2SiegeSummonInstance))
+		if (!getEffected().isSummon())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml

@@ -3175,7 +3175,9 @@
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant1 name="mpInitialConsume" val="#ench1mpInitialConsume" />
 		<for>
-			<effect name="NpcKill" val="0" />
+			<effect name="Unsummon" val="0">
+				<param chance="80" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1396" levels="10" name="Magical Backfire" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">