BETA: !GiveSp effect from skillhandlers to effecthandlers.

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

@@ -57,6 +57,7 @@ import handlers.effecthandlers.EnemyCharge;
 import handlers.effecthandlers.FakeDeath;
 import handlers.effecthandlers.Fear;
 import handlers.effecthandlers.Fusion;
+import handlers.effecthandlers.GiveSp;
 import handlers.effecthandlers.Grow;
 import handlers.effecthandlers.Harvesting;
 import handlers.effecthandlers.Heal;
@@ -153,6 +154,7 @@ public final class EffectMasterHandler
 		FakeDeath.class,
 		Fear.class,
 		Fusion.class,
+		GiveSp.class,
 		Grow.class,
 		Harvesting.class,
 		HealOverTime.class,

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

@@ -227,7 +227,6 @@ import handlers.skillhandlers.Fishing;
 import handlers.skillhandlers.FishingSkill;
 import handlers.skillhandlers.GetPlayer;
 import handlers.skillhandlers.GiveReco;
-import handlers.skillhandlers.GiveSp;
 import handlers.skillhandlers.GiveVitality;
 import handlers.skillhandlers.Heal;
 import handlers.skillhandlers.HealPercent;
@@ -571,7 +570,6 @@ public class MasterHandler
 			GetPlayer.class,
 			TransformDispel.class,
 			Trap.class,
-			GiveSp.class,
 			GiveReco.class,
 			GiveVitality.class,
 			InstantJump.class,

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java

@@ -0,0 +1,62 @@
+/*
+ * 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.effecthandlers;
+
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+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;
+
+/**
+ * Give SP effect.
+ * @author Adry_85
+ */
+public class GiveSp extends L2Effect
+{
+	public GiveSp(Env env, EffectTemplate template)
+	{
+		super(env, template);
+	}
+	
+	@Override
+	public boolean onActionTime()
+	{
+		return false;
+	}
+	
+	@Override
+	public L2EffectType getEffectType()
+	{
+		return L2EffectType.GIVE_SP;
+	}
+	
+	@Override
+	public boolean onStart()
+	{
+		if ((getEffector() == null) || (getEffected() == null) || !getEffector().isPlayer() || !getEffected().isPlayer() || getEffected().isAlikeDead())
+		{
+			return false;
+		}
+		
+		final L2PcInstance player = getEffector().getActingPlayer();
+		player.addExpAndSp(0, (int) calc());
+		return true;
+	}
+}

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

@@ -1,56 +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.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
-
-/**
- * @author Forsaiken
- */
-public class GiveSp implements ISkillHandler
-{
-	private static final L2SkillType[] SKILL_IDS =
-	{
-		L2SkillType.GIVE_SP
-	};
-	
-	@Override
-	public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
-	{
-		for (L2Object obj : targets)
-		{
-			L2Character target = (L2Character) obj;
-			if (target != null)
-			{
-				int spToAdd = (int) skill.getPower();
-				target.addExpAndSp(0, spToAdd);
-			}
-		}
-	}
-	
-	@Override
-	public L2SkillType[] getSkillIds()
-	{
-		return SKILL_IDS;
-	}
-}

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

@@ -749,16 +749,17 @@
 	</skill>
 	<skill id="2167" levels="4" name="Scroll of SP">
 		<!-- Confirmed CT2.5 -->
-		<table name="#power"> 500 5000 100000 500000 </table>
+		<table name="#amount"> 500 5000 100000 500000 </table>
 		<set name="hitTime" val="200" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="3000" />
-		<set name="skillType" val="GIVE_SP" />
 		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="GiveSp" noicon="1" val="#amount" />
+		</for>
 	</skill>
 	<skill id="2168" levels="6" name="Raid Blessing">
 		<table name="#abnormalLvls"> 1 2 3 4 5 6 </table>

L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml

@@ -91,19 +91,20 @@
 		<!-- Lvl 1 Name - Blue Primeval Crystal -->
 		<!-- Lvl 2 Name - Green Primeval Crystal -->
 		<!-- Lvl 3 Name - Red Primeval Crystal -->
-		<table name="#power"> 50000 100000 200000 </table>
+		<table name="#amount"> 50000 100000 200000 </table>
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="hitTime" val="200" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="3000" />
-		<set name="skillType" val="GIVE_SP" />
 		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
 			<player levelRange="76;85" />
 		</cond>
+		<for>
+			<effect name="GiveSp" noicon="1" val="#amount" />
+		</for>
 	</skill>
 	<skill id="2307" levels="1" name="Remove Petrification Scroll">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/02600-02699.xml

@@ -76,19 +76,20 @@
 		<!-- Lvl 1: Blue Crystal of Fantasy -->
 		<!-- Lvl 2: Green Crystal of Fantasy -->
 		<!-- Lvl 3: Red Crystal of Fantasy -->
-		<table name="#power"> 50000 100000 200000 </table>
+		<table name="#amount"> 50000 100000 200000 </table>
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="hitTime" val="200" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="3000" />
-		<set name="skillType" val="GIVE_SP" />
 		<set name="target" val="TARGET_SELF" />
 		<cond msgId="113" addName="1">
 			<player level="76" />
 		</cond>
+		<for>
+			<effect name="GiveSp" noicon="1" val="#amount" />
+		</for>
 	</skill>
 	<skill id="2609" levels="20" name="Escape">
 		<table name="#teleCoords"> -84318,244579,-3730 46934,51467,-2977 9745,15606,-4574 -44836,-112524,-235 115113,-178212,-901 -80826,149775,-3043 -12678,122776,-3116 15670,142983,-2705 17836,170178,-3507 83400,147943,-3404 105918,109759,-3207 111409,219364,-3545 82956,53162,-1495 85348,16142,-3699 116819,76994,-2714 146331,25762,-2018 147928,-55273,-2734 43799,-47727,-798 87331,-142842,-1317 -117251,46771,360 </table>

L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml

@@ -808,10 +808,11 @@
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="10000" />
 		<set name="reuseDelay" val="2000" />
-		<set name="skillType" val="GIVE_SP" />
 		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="GiveSp" noicon="1" val="10000" />
+		</for>
 	</skill>
 	<skill id="9070" levels="1" name="Halloween Pumpkin">
 		<!-- Confirmed CT2.5 -->

L2J_DataPack_BETA/dist/game/data/stats/skills/09100-09199.xml

@@ -897,10 +897,11 @@
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="500000" />
 		<set name="reuseDelay" val="3000" />
-		<set name="skillType" val="GIVE_SP" />
 		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="GiveSp" noicon="1" val="500000" />
+		</for>
 	</skill>
 	<skill id="9175" levels="1" name="1,000,000 SP scroll">
 		<!-- High Five Skill --> 
@@ -908,10 +909,11 @@
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="1000000" />
 		<set name="reuseDelay" val="3000" />
-		<set name="skillType" val="GIVE_SP" />
 		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="GiveSp" noicon="1" val="1000000" />
+		</for>
 	</skill>
 	<skill id="9176" levels="1" name="Provided gift of cheers">
 		<!-- none -->
@@ -952,15 +954,16 @@
 	</skill>
 	<skill id="9180" levels="2" name="10,000,000 SP scroll">
 		<!-- High Five Skill --> 
-		<table name="#power">5000000 10000000 </table>
+		<table name="#amount">5000000 10000000 </table>
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="3000" />
-		<set name="skillType" val="GIVE_SP" />
 		<set name="target" val="TARGET_SELF" />
+		<for>
+			<effect name="GiveSp" noicon="1" val="#amount" />
+		</for>
 	</skill>
 	<skill id="9181" levels="1" name="Nevit's Hourglass - 4 hour(s)">
 		<!-- Increases Nevit's blessing by 4 hour(s). -->