Sync with L2jServer HighFive Oct 22nd 2015.

trunk/dist/db_installer/sql/game/announcements.sql

@@ -11,4 +11,4 @@ CREATE TABLE IF NOT EXISTS `announcements` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 INSERT INTO announcements (`type`, `author`, `content`) VALUES 
-(0, 'Mobius', 'Powered by L2J-Mobius');
+(0, 'Mobius', 'Server powered by L2J-Mobius project.');

trunk/dist/db_installer/sql/game/custom_npc_buffer.sql

@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS `custom_npc_buffer`;
 CREATE TABLE IF NOT EXISTS `custom_npc_buffer` (
-  `npc_id` mediumint(7) NOT NULL,
+  `npc_id` int(10) NOT NULL,
   `skill_id` int(6) NOT NULL,
   `skill_level` int(6) NOT NULL DEFAULT '1',
   `skill_fee_id` int(6) NOT NULL DEFAULT '0',

trunk/dist/db_installer/sql/game/custom_spawnlist.sql

@@ -2,8 +2,8 @@ DROP TABLE IF EXISTS `custom_spawnlist`;
 CREATE TABLE IF NOT EXISTS `custom_spawnlist` (
   `location` varchar(40) NOT NULL DEFAULT '',
   `count` tinyint(1) unsigned NOT NULL DEFAULT '0',
-  `npc_templateid` mediumint(7) unsigned NOT NULL DEFAULT '0',
-  `locx` mediumint(6) NOT NULL DEFAULT '0',
+  `npc_templateid` int(10) unsigned NOT NULL DEFAULT '0',
+  `locx` mediumint(8) NOT NULL DEFAULT '0',
   `locy` mediumint(6) NOT NULL DEFAULT '0',
   `locz` mediumint(6) NOT NULL DEFAULT '0',
   `randomx` mediumint(6) NOT NULL DEFAULT '0',

trunk/dist/db_installer/sql/game/raidboss_spawnlist.sql

@@ -331,9 +331,9 @@ INSERT IGNORE INTO `raidboss_spawnlist` (`boss_id`,`loc_x`,`loc_y`,`loc_z`,`head
 -- (29144,0,0,0,0,0,0,0,0), -- Lost Captain (78) (Spawned by Kamaloka's instance)
 -- (29147,0,0,0,0,0,0,0,0), -- Lost Captain (81) (Spawned by Kamaloka's instance)
 -- (29186,0,0,0,0,0,0,0,0), -- Balor (85) (stats to be done)
-(25725,152316,110439,-5520,36811,129600,86400,6165648,20499), -- Drake Lord (85)
-(25726,145734,120031,-3912,45303,129600,86400,6165648,20499), -- Behemoth Leader (85)
-(25727,148482,117859,-3712,36584,129600,86400,6165648,20499); -- Dragon Beast (85)
+(25725,152260,110394,-5552,0,129600,86400,6165648,20499), -- Drake Lord (85)
+(25726,145788,120118,-3912,32768,129600,86400,6165648,20499), -- Behemoth Leader (85)
+(25727,148241,117965,-3712,0,129600,86400,6165648,20499); -- Dragon Beast (85)
 
 -- Removed
 DELETE FROM `raidboss_spawnlist` WHERE (boss_id = 25118); -- Guilotine, Warden Of The Execution Grounds

trunk/dist/game/config/Server.ini

@@ -57,7 +57,7 @@ Password =
 # Available: C3P0, HikariCP, BoneCP
 ConnectionPool = C3P0
 
-# Default: 100
+# Default: 500
 MaximumDbConnections = 500
 
 # Default: 0

trunk/dist/game/config/default-ipconfig.xml

@@ -8,4 +8,6 @@
 	<define subnet="10.0.0.0/8" address="10.0.0.0" />
 	<define subnet="172.16.0.0/19" address="172.16.0.0" />
 	<define subnet="192.168.0.0/16" address="192.168.0.0" />
+	<define subnet="192.168.0.0/24" address="192.168.0.0" />
+	<define subnet="192.168.1.0/24" address="192.168.1.0" />
 </gameserver>

trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java

@@ -26,6 +26,7 @@ import java.util.StringTokenizer;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
+import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -160,47 +161,39 @@ public class AdminBuffs implements IAdminCommandHandler
 			StringTokenizer st = new StringTokenizer(command, " ");
 			command = st.nextToken();
 			
-			L2PcInstance player = null;
+			L2Character creature = null;
 			if (st.hasMoreTokens())
 			{
-				String playername = st.nextToken();
-				
-				try
+				creature = L2World.getInstance().getPlayer(st.nextToken());
+				if (creature == null)
 				{
-					player = L2World.getInstance().getPlayer(playername);
-				}
-				catch (Exception e)
-				{
-				}
-				
-				if (player == null)
-				{
-					activeChar.sendMessage("The player " + playername + " is not online.");
+					activeChar.sendMessage("The player " + creature + " is not online.");
 					return false;
 				}
 			}
-			else if ((activeChar.getTarget() != null) && activeChar.getTarget().isPlayer())
-			{
-				player = activeChar.getTarget().getActingPlayer();
-			}
 			else
 			{
-				activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
-				return false;
+				final L2Object target = activeChar.getTarget();
+				if ((target != null) && target.isCharacter())
+				{
+					creature = (L2Character) target;
+				}
+				
+				if (creature == null)
+				{
+					activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+					return false;
+				}
 			}
 			
-			try
+			creature.resetTimeStamps();
+			creature.resetDisabledSkills();
+			if (creature.isPlayer())
 			{
-				player.resetTimeStamps();
-				player.resetDisabledSkills();
-				player.sendPacket(new SkillCoolTime(player));
-				activeChar.sendMessage("Skill reuse was removed from " + player.getName() + ".");
-				return true;
-			}
-			catch (NullPointerException e)
-			{
-				return false;
+				creature.sendPacket(new SkillCoolTime(creature.getActingPlayer()));
 			}
+			activeChar.sendMessage("Skill reuse was removed from " + creature.getName() + ".");
+			return true;
 		}
 		else if (command.startsWith("admin_switch_gm_buffs"))
 		{
@@ -384,4 +377,4 @@ public class AdminBuffs implements IAdminCommandHandler
 			}
 		}
 	}
-}
+}

trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java

@@ -68,7 +68,7 @@ public final class MagicalAttackMp extends AbstractEffect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.MAGICAL_ATTACK;
+		return L2EffectType.MAGICAL_ATTACK_MP;
 	}
 	
 	@Override

trunk/dist/game/data/stats/items/20700-20799.xml

@@ -914,7 +914,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_depositable" val="false" />
 		<set name="is_oly_restricted" val="true" />
-		<set name="handler" val="ItemSkills" />
+		<set name="handler" val="SummonItems" />
 		<set name="item_skill" val="2046-1" />
 		<set name="use_condition" val="{{uc_transmode_exclude;{tt_pure_stat}}}" />
 		<cond msgId="113" addName="1">
@@ -934,7 +934,7 @@
 		<set name="is_premium" val="true" />
 		<set name="is_oly_restricted" val="true" />
 		<set name="is_freightable" val="true" />
-		<set name="handler" val="ItemSkills" />
+		<set name="handler" val="SummonItems" />
 		<set name="item_skill" val="2046-1" />
 		<set name="use_condition" val="{{uc_transmode_exclude;{tt_pure_stat}}}" />
 		<cond msgId="113" addName="1">

trunk/dist/game/data/stats/skills/00900-00999.xml

@@ -2018,12 +2018,13 @@
 		</for>
 	</skill>
 	<skill id="984" levels="25" name="Shield Strike">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#effectPoints"> -377 -392 -407 -437 -453 -469 -501 -518 -535 -570 -588 -606 -643 -662 -681 -719 -738 -758 -777 -797 -816 -836 -856 -875 -895 </table>
 		<table name="#magicLvl"> 40 43 46 49 52 55 58 60 62 64 66 68 70 72 74 76 77 78 79 80 81 82 83 84 85 </table>
 		<table name="#mpConsume"> 38 41 44 48 51 55 58 61 62 65 67 69 71 73 75 77 78 78 79 80 80 81 82 82 83 </table>
 		<table name="#power"> 833 992 1171 1371 1592 1832 2091 2272 2460 2653 2850 3050 3252 3453 3653 3849 3945 4040 4133 4224 4312 4399 4482 4563 4640 </table>
 		<set name="castRange" val="40" />
+		<set name="coolTime" val="380" />
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="effectRange" val="400" />
 		<set name="hitTime" val="1080" />
@@ -2031,7 +2032,7 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="nextActionAttack" val="true" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="power" val="#power" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE" />
@@ -2045,20 +2046,22 @@
 		</for>
 	</skill>
 	<skill id="985" levels="1" name="Challenge for Fate">
-		<!-- High Five Skill -->
-		<set name="abnormalTime" val="4" />
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="5" />
+		<set name="abnormalType" val="TARGET_LOCK" />
 		<set name="affectLimit" val="10-10" />
-		<set name="affectRange" val="100" /> <!-- FIXME: value unconfirmed -->
-		<set name="castRange" val="400" />
-		<set name="effectPoint" val="-7987" />
-		<set name="effectRange" val="900" />
+		<set name="affectRange" val="550" />
+		<set name="effectPoint" val="-10000" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill0985" />
+		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="45000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="AREA" />
+		<set name="staticReuse" val="true" />
+		<set name="targetType" val="AURA" />
 		<for>
 			<effect name="TargetMe" />
 			<effect name="GetAgro" />
@@ -2070,7 +2073,7 @@
 		</selfEffects>
 	</skill>
 	<skill id="986" levels="25" name="Deadly Strike">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 43 46 49 52 55 58 60 62 64 66 68 70 72 74 76 77 78 79 80 81 82 83 84 85 </table>
 		<table name="#mpConsume"> 38 41 44 48 51 55 58 61 62 65 67 69 71 73 75 77 78 78 79 80 80 81 82 82 83 </table>
 		<table name="#power"> 833 992 1171 1371 1592 1832 2091 2272 2460 2653 2850 3050 3252 3453 3653 3849 3945 4040 4133 4224 4312 4399 4482 4563 4640 </table>
@@ -2082,33 +2085,33 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="nextActionAttack" val="true" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="overHit" val="true" />
 		<set name="power" val="#power" />
 		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
-			<not>
-				<using kind="FIST,DUALFIST,BOW,CROSSBOW" />
-			</not>
+			<using kind="SWORD,BLUNT,DAGGER,DUALDAGGER,DUAL,POLE" />
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
 		</for>
 	</skill>
 	<skill id="987" levels="1" name="Multiple Shot">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="affectLimit" val="5-12" />
-		<set name="affectRange" val="250" />
-		<set name="baseCritRate" val="15" /> <!-- FIXME: value unconfirmed -->
+		<set name="affectRange" val="900" />
+		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-887" />
-		<set name="effectRange" val="1400" />
+		<set name="effectRange" val="1100" />
+		<set name="fanRange" val="0,0,900,45" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill0987" />
 		<set name="magicLvl" val="82" />
 		<set name="mpConsume" val="162" />
+		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="overHit" val="true" />
 		<set name="power" val="16667" />
@@ -2123,21 +2126,26 @@
 		</for>
 	</skill>
 	<skill id="988" levels="3" name="Battle Whisper">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#amount"> 1.05 1.07 1.1 </table>
 		<table name="#effectPoints"> 454 523 635 </table>
 		<table name="#magicLvl"> 46 52 60 </table>
 		<table name="#pAtk"> 1.05 1.1 1.15 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
+		<set name="abnormalType" val="SONG_BATTLE_WHISPER" />
+		<!-- <set name="affectRange" val="1000" /> -->
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill0988" />
 		<set name="isMagic" val="3" /> <!-- Dance Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="30" />
+		<set name="mpInitialConsume" val="8" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="3000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="Buff">
@@ -2148,8 +2156,11 @@
 		</for>
 	</skill>
 	<skill id="989" levels="1" name="Defense Motion">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="120" />
+		<set name="abnormalType" val="DANCE_DEFENCE_MOTION1" />
+		<!-- <set name="affectRange" val="1000" /> -->
 		<set name="effectPoint" val="635" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill0989" />
@@ -2158,8 +2169,11 @@
 		<set name="mpConsume" val="30" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="3000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<cond msgId="113" addName="1">
+			<using kind="DUAL" />
+		</cond>
 		<for>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.25" />
@@ -2168,9 +2182,9 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="990" levels="1" name="Death Sting">
-		<!-- High Five Skill -->
-		<set name="baseCritRate" val="15" /> <!-- FIXME: value unconfirmed -->
+	<skill id="990" levels="1" name="Death Shot">
+		<!-- Confirmed High Five -->
+		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-887" />
 		<set name="effectRange" val="1400" />
@@ -2192,19 +2206,20 @@
 		</for>
 	</skill>
 	<skill id="991" levels="1" name="Throwing Dagger">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="10" />
 		<set name="abnormalType" val="SPEED_DOWN" />
 		<set name="activateRate" val="40" />
+		<set name="baseCritRate" val="15" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="300" />
 		<set name="effectPoint" val="-569" />
-		<set name="effectRange" val="800" />
+		<set name="effectRange" val="500" />
 		<set name="hitTime" val="1080" />
 		<set name="icon" val="icon.skill0991" />
 		<set name="isDebuff" val="true" />
-		<set name="lvlBonusRate" val="2" /> <!-- FIXME: value unconfirmed -->
+		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="80" />
 		<set name="mpConsume" val="82" />
 		<set name="nextActionAttack" val="true" />
@@ -2224,15 +2239,20 @@
 		</for>
 	</skill>
 	<skill id="992" levels="8" name="Sonic Mastery">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 43 49 55 60 66 70 79 </table>
 		<table name="#skillLevel"> 1 2 3 4 5 6 7 8 </table>
 		<set name="icon" val="icon.skill0992" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="PASSIVE" />
+		<cond msgId="324">
+			<not>
+				<player Charges="#skillLevel" />
+			</not>
+		</cond>
 		<for>
 			<effect name="TriggerSkillByAttack">
-				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="15" />
 				<param skillId="6813" skillLevel="#skillLevel" /> <!-- Focus Sonic -->
@@ -2250,16 +2270,21 @@
 		</for>
 	</skill>
 	<skill id="993" levels="8" name="Force Mastery">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 24 32 40 52 60 66 72 79 </table>
 		<table name="#skillLevel"> 1 2 3 4 5 6 7 8 </table>
 		<set name="icon" val="icon.skill0993" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="PASSIVE" />
 		<set name="targetType" val="SELF" />
+		<cond msgId="324">
+			<not>
+				<player Charges="#skillLevel" />
+			</not>
+		</cond>
 		<for>
 			<effect name="TriggerSkillByAttack">
-				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="15" />
 				<param skillId="6814" skillLevel="#skillLevel" /> <!-- Focus Force -->
@@ -2277,7 +2302,7 @@
 		</for>
 	</skill>
 	<skill id="994" levels="1" name="Rush">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="200" />
 		<set name="effectPoint" val="-303" />
@@ -2285,8 +2310,8 @@
 		<set name="flyType" val="CHARGE" />
 		<set name="hitTime" val="800" />
 		<set name="icon" val="icon.skill0484" />
-		<set name="magicLvl" val="40" />
-		<set name="mpConsume" val="38" />
+		<set name="magicLvl" val="32" />
+		<set name="mpInitialConsume" val="20" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="DIRECTIONAL_INSTANT" />
 		<set name="reuseDelay" val="3000" />
@@ -2294,10 +2319,8 @@
 		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
 			<and>
+				<using kind="SWORD,BLUNT,DAGGER,DUALDAGGER,DUALFIST,DUAL,POLE" />
 				<target mindistance="200" />
-				<not>
-					<using kind="BOW,CROSSBOW" />
-				</not>
 			</and>
 		</cond>
 		<for>
@@ -2305,7 +2328,7 @@
 		</for>
 	</skill>
 	<skill id="995" levels="1" name="Rush Impact">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="9" />
 		<set name="abnormalType" val="STUN" />
@@ -2323,25 +2346,24 @@
 		<set name="icon" val="icon.skill0793" />
 		<set name="isDebuff" val="true" />
 		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="83" />
-		<set name="mpConsume" val="82" />
+		<set name="magicLvl" val="78" />
+		<set name="mpInitialConsume" val="83" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="DIRECTIONAL_CONTINUOUS" />
 		<set name="power" val="4224" />
 		<set name="reuseDelay" val="20000" />
 		<set name="rideState" val="NONE" />
+		<set name="soulMaxConsumeCount" val="5" />
 		<set name="targetType" val="FRONT_AREA" />
 		<set name="trait" val="SHOCK" />
 		<cond msgId="113" addName="1">
 			<and>
+				<using kind="SWORD,BLUNT,DAGGER,DUALDAGGER,DUALFIST,DUAL,POLE" />
 				<target mindistance="200" />
-				<not>
-					<using kind="BOW,CROSSBOW" />
-				</not>
 			</and>
 		</cond>
 		<for>
-			<effect name="PhysicalAttack" />
+			<effect name="PhysicalSoulAttack" />
 			<effect name="Stun" />
 		</for>
 	</skill>
@@ -2369,18 +2391,23 @@
 		</for>
 	</skill>
 	<skill id="997" levels="25" name="Crushing Strike">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 43 46 49 52 55 58 60 62 64 66 68 70 72 74 76 77 78 79 80 81 82 83 84 85 </table>
 		<table name="#mpConsume"> 38 41 44 48 51 55 58 61 62 65 67 69 71 73 75 77 78 78 79 80 80 81 82 82 83 </table>
 		<table name="#power"> 1041 1240 1464 1714 1990 2290 2614 2840 3075 3316 3563 3813 4065 4316 4566 4689 4811 4931 5050 5166 5280 5390 5498 5603 5704 </table>
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3" />
+		<set name="abnormalType" val="MULTI_DEBUFF_G" />
 		<set name="activateRate" val="80" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="40" />
+		<set name="coolTime" val="200" />
 		<set name="effectPoint" val="-52" />
 		<set name="effectRange" val="400" />
 		<set name="hitTime" val="800" />
 		<set name="icon" val="icon.skill0997" />
+		<set name="isDebuff" val="true" />
+		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="nextActionAttack" val="true" />
@@ -2402,26 +2429,25 @@
 		</for>
 	</skill>
 	<skill id="998" levels="1" name="Blazing Boost">
-		<!-- High Five Skill -->
-		<set name="castRange" val="400" />
-		<set name="coolTime" val="200" /> <!-- FIXME: value unconfirmed -->
+		<!-- Confirmed High Five -->
+		<set name="castRange" val="600" />
+		<set name="coolTime" val="200" />
 		<set name="effectPoint" val="-303" />
 		<set name="effectRange" val="900" />
 		<set name="flyType" val="CHARGE" />
 		<set name="hitTime" val="800" />
 		<set name="icon" val="icon.skill0998" />
 		<set name="magicLvl" val="40" />
-		<set name="mpConsume" val="38" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpInitialConsume" val="38" />
+		<set name="nextActionAttack" val="true" />
+		<set name="operateType" val="DIRECTIONAL_INSTANT" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
 			<and>
-				<target mindistance="200" />
-				<not>
-					<using kind="BOW,CROSSBOW" />
-				</not>
+				<using kind="DAGGER,DUALDAGGER,SWORD,BLUNT,FIST" />
+				<target mindistance="400" />
 			</and>
 		</cond>
 		<for>

trunk/dist/game/data/stats/skills/01500-01599.xml

@@ -1591,9 +1591,9 @@
 		</enchant3for>
 	</skill>
 	<skill id="1549" levels="1" name="Chant of Elements">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<!-- NOTE: skill desc says "increases the elemental attribute" but is client typo, it increase defense (see skill icon) -->
-		<set name="abnormalLvl" val="3" />
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MD_UP_ATTR" />
 		<set name="affectRange" val="1000" />
@@ -1601,8 +1601,8 @@
 		<set name="icon" val="icon.skill1549" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="76" />
-		<set name="mpConsume" val="220" />
-		<set name="mpInitialConsume" val="55" />
+		<set name="mpConsume" val="55" />
+		<set name="mpInitialConsume" val="220" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1617,7 +1617,7 @@
 		</for>
 	</skill>
 	<skill id="1550" levels="1" name="Mass Cure Poison">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="affectRange" val="1000" />
 		<set name="effectPoint" val="1000" />
 		<set name="hitTime" val="4000" />
@@ -1637,7 +1637,7 @@
 		</for>
 	</skill>
 	<skill id="1551" levels="1" name="Mass Purify">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="affectRange" val="1000" />
 		<set name="effectPoint" val="1000" />
 		<set name="hitTime" val="3000" />
@@ -1652,31 +1652,31 @@
 		<set name="targetType" val="PARTY" />
 		<for>
 			<effect name="DispelBySlot">
-				<param dispel="POISON,9;BLEEDING,9;PARALYZE,1;TURN_STONE,1" />
+				<param dispel="POISON,9;BLEEDING,9;PARALYZE,9;TURN_STONE,9" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="1552" levels="1" name="Mass Vitalize">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="affectRange" val="1000" />
 		<set name="effectPoint" val="1000" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1552" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="76" />
-		<set name="mpConsume" val="155" />
-		<set name="mpInitialConsume" val="38" />
+		<set name="mpConsume" val="38" />
+		<set name="mpInitialConsume" val="155" />
 		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="reuseDelay" val="9000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="Heal">
-				<param power="796" />
-			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="POISON,9;BLEEDING,9" />
 			</effect>
+			<effect name="Heal">
+				<param power="796" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1553" levels="1" name="Chain Heal">
@@ -1705,10 +1705,10 @@
 		</for>
 	</skill>
 	<skill id="1554" levels="1" name="Aura Blast">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalTime" val="3" />
 		<set name="affectLimit" val="2-10" />
-		<set name="affectRange" val="100" /> <!-- FIXME: value unconfirmed -->
+		<set name="affectRange" val="200" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-288" />
 		<set name="effectRange" val="1400" />
@@ -1716,9 +1716,9 @@
 		<set name="icon" val="icon.skill1554" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="81" />
-		<set name="mpConsume" val="116" />
-		<set name="mpInitialConsume" val="29" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpConsume" val="31" />
+		<set name="mpInitialConsume" val="145" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="power" val="199" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
 		<set name="pvpPower" val="141" />
 		<set name="reuseDelay" val="15000" />
@@ -1727,24 +1727,19 @@
 		<for>
 			<effect name="MagicalAttack" />
 		</for>
-		<selfEffects>
-			<effect name="ManaHeal">
-				<param power="10" />  <!-- FIXME: value unconfirmed -->
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="1555" levels="1" name="Aura Cannon">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="castRange" val="150" />
 		<set name="effectPoint" val="-993" />
-		<set name="effectRange" val="650" />
+		<set name="effectRange" val="600" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1555" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="82" />
-		<set name="mpConsume" val="99" />
-		<set name="mpInitialConsume" val="24" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpConsume" val="27" />
+		<set name="mpInitialConsume" val="123" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="power" val="302" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
 		<set name="pvpPower" val="178" />
 		<set name="reuseDelay" val="10000" />
@@ -1753,11 +1748,6 @@
 		<for>
 			<effect name="MagicalAttack" />
 		</for>
-		<selfEffects>
-			<effect name="ManaHeal">
-				<param power="10" />  <!-- FIXME: value unconfirmed -->
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="1556" levels="1" name="Arcane Shield">
 		<!-- High Five Skill -->
@@ -1781,7 +1771,7 @@
 		</for>
 	</skill>
 	<skill id="1557" levels="1" name="Servitor Share">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SUMMON_CONDITION" />
@@ -1818,10 +1808,11 @@
 		</for>
 	</skill>
 	<skill id="1558" levels="24" name="Dimension Spiral">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 44 48 52 56 58 60 62 64 66 68 70 72 74 76 77 78 79 80 81 82 83 84 85 </table>
-		<table name="#mpConsume"> 38 43 47 50 53 55 57 59 60 63 64 67 74 83 92 99 100 106 109 115 118 119 125 134 </table>
-		<table name="#power"> 57 58 60 61 63 66 68 71 74 77 79 82 89 94 100 104 110 115 139 152 166 179 193 207 </table>
+		<table name="#mpConsume"> 31 35 38 40 43 44 46 48 48 51 52 54 60 67 74 80 80 85 88 92 95 96 100 108 </table>
+		<table name="#mpInitialConsume"> 7 8 9 10 10 11 11 11 12 12 12 13 14 16 18 19 20 21 21 23 23 23 25 26 </table>
+		<table name="#power"> 57 58 60 61 63 66 68 71 74 77 79 82 89 94 100 104 110 115 136 152 166 179 193 207 </table>
 		<table name="#pvpPower"> 57 58 60 61 63 66 68 71 74 77 79 82 84 87 89 90 91 92 93 94 95 96 97 98 </table>
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-993" />
@@ -1831,7 +1822,8 @@
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpInitialConsume" val="#mpInitialConsume" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="overHit" val="true" />
 		<set name="power" val="#power" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
 		<set name="pvpPower" val="#pvpPower" />
@@ -1840,18 +1832,12 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="TriggerSkillBySkill">
-				<param castSkillId="1558" /> <!-- Dimension Spiral -->
-				<param chance="5" />
-				<param skillId="5571" skillLevel="1" /> <!-- Mutual Response -->
-				<param targetType="SUMMON" />
-			</effect>
 		</for>
 	</skill>
 	<skill id="1559" levels="3" name="Potential Ability">
-		<!-- High Five Skill -->
-		<table name="#cAtkAdd"> 177 295 384 </table>
-		<table name="#magicLvl"> 28 40 49 </table>
+		<!-- Confirmed High Five -->
+		<table name="#cAtkAdd"> 117 295 384 </table>
+		<table name="#magicLvl"> 28 40 58 </table>
 		<table name="#rCrit"> 1.2 1.3 1.4 </table>
 		<set name="icon" val="icon.skill1559" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -1860,26 +1846,23 @@
 		<for>
 			<effect name="Buff">
 				<mul stat="critRate" val="#rCrit">
-					<using kind="DAGGER,DUALDAGGER,LIGHT" />
+					<using kind="DAGGER,DUALDAGGER" />
 				</mul>
 				<add stat="critDmgAdd" val="#cAtkAdd">
-					<using kind="DAGGER,DUALDAGGER,LIGHT" />
+					<using kind="DAGGER,DUALDAGGER" />
 				</add>
 			</effect>
 		</for>
 	</skill>
 	<skill id="1560" levels="1" name="Lucky Blow">
-		<!-- High Five Skill -->
-		<set name="baseCritRate" val="30" />
-		<set name="blowChance" val="60" />
+		<!-- Confirmed High Five -->
+		<set name="baseCritRate" val="10" />
+		<set name="blowChance" val="30" />
 		<set name="castRange" val="40" />
-		<set name="coolTime" val="720" />
 		<set name="effectPoint" val="-337" />
 		<set name="effectRange" val="400" />
-		<set name="halfKillRate" val="8" />
 		<set name="hitTime" val="1800" />
 		<set name="icon" val="icon.skill1560" />
-		<set name="lethalStrikeRate" val="1" /> <!-- FIXME: unconfirmed -->
 		<set name="magicLvl" val="83" />
 		<set name="mpConsume" val="82" />
 		<set name="nextActionAttack" val="true" />
@@ -1895,18 +1878,22 @@
 		</cond>
 		<for>
 			<effect name="FatalBlow" />
+			<effect name="Lethal">
+				<param halfLethal="10" />
+				<param fullLethal="5" />
+			</effect>
 			<effect name="Spoil" />
 		</for>
 	</skill>
 	<skill id="1561" levels="5" name="Battle Cry">
-		<!-- High Five Skill -->
-		<table name="#abnormalLvls"> 2 3 4 5 6 </table>
+		<!-- Confirmed High Five -->
+		<table name="#abnormalLvls"> 1 2 3 4 5 </table>
 		<table name="#MaxHp"> 15 20 25 30 35 </table>
 		<table name="#magicLvl"> 40 49 58 64 70 </table>
 		<table name="#mpConsume"> 18 22 27 30 33 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="600" />
-		<set name="abnormalType" val="MAX_HP_UP" />
+		<set name="abnormalType" val="MAX_HP_CP_UP" />
 		<set name="effectPoint" val="268" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1561" />
@@ -1925,17 +1912,15 @@
 		</for>
 	</skill>
 	<skill id="1562" levels="2" name="Chant of Berserker">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#abnormalLvls"> 1 2 </table>
+		<table name="#amount"> 1.05 1.08 </table>
 		<table name="#effectPoints"> 549 611 </table>
 		<table name="#magicLvl"> 44 52 </table>
 		<table name="#mAtk"> 1.1 1.16 </table>
-		<table name="#mAtkSpd"> 1.05 1.08 </table>
 		<table name="#mDef"> 0.9 0.84 </table>
-		<table name="#mpConsume"> 124 151 </table>
-		<table name="#mpInitialConsume"> 30 37 </table>
-		<table name="#pAtk"> 1.05 1.08 </table>
-		<table name="#pAtkSpd"> 1.05 1.08 </table>
+		<table name="#mpConsume"> 154 188 </table>
+		<table name="#mpInitialConsume"> 8 41 </table>
 		<table name="#pDef"> 0.95 0.92 </table>
 		<table name="#rEvas"> 2 4 </table>
 		<table name="#runSpd"> 5 8 </table>
@@ -1959,27 +1944,27 @@
 				<mul stat="pDef" val="#pDef" />
 				<mul stat="mDef" val="#mDef" />
 				<sub stat="rEvas" val="#rEvas" />
-				<mul stat="pAtk" val="#pAtk" />
+				<mul stat="pAtk" val="#amount" />
 				<mul stat="mAtk" val="#mAtk" />
-				<mul stat="pAtkSpd" val="#pAtkSpd" />
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
+				<mul stat="pAtkSpd" val="#amount" />
+				<mul stat="mAtkSpd" val="#amount" />
 				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="1563" levels="2" name="Fury of Pa'agrio">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#abnormalLvls"> 1 2 </table>
 		<table name="#effectPoints"> 379 457 </table>
 		<table name="#magicLvl"> 48 56 </table>
-		<table name="#mpConsume"> 138 164 </table>
-		<table name="#mpInitialConsume"> 34 40 </table>
+		<table name="#mpConsume"> 172 204 </table>
+		<table name="#mpInitialConsume"> 28 35 </table>
 		<table name="#pAtkSpd"> 1.15 1.33 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
 		<set name="affectLimit" val="50-50" />
-		<set name="affectRange" val="900" />
+		<set name="affectRange" val="1000" />
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill1563" />
@@ -2007,14 +1992,14 @@
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param minDamage="1" />
-				<param chance="5" />
+				<param chance="50" />
 				<param skillId="6921" skillLevel="1" /> <!-- Penetration Attack -->
 				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="1565" levels="6" name="Mana Pump" enchantGroup1="1">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 49 58 64 68 72 </table>
 		<table name="#maxMp"> 70 100 140 150 180 200 </table>
 		<table name="#ench1maxMp"> 203 206 210 213 216 220 223 226 230 233 236 240 243 246 250 253 256 260 263 266 270 273 276 280 283 286 290 293 296 300 </table>

trunk/dist/game/data/stats/skills/06700-06799.xml

@@ -556,34 +556,35 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6743" levels="1" name="Dark Wound">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
-		<set name="abnormalLvl" val="1" />
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="20" />
 		<set name="abnormalType" val="BLEEDING" />
 		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
 		<set name="activateRate" val="100" />
 		<set name="basicProperty" val="CON" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="castRange" val="1500" />
+		<set name="castRange" val="400" />
+		<set name="coolTime" val="300" />
 		<set name="effectPoint" val="-100" />
-		<set name="effectRange" val="2000" />
+		<set name="effectRange" val="900" />
+		<set name="element" val="5" /> <!-- Dark -->
+		<set name="elementPower" val="30" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill0096" />
 		<set name="isDebuff" val="true" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="85" />
-		<set name="mpConsume" val="25" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="magicLvl" val="83" />
+		<set name="mpConsume" val="34" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="reuseDelay" val="5000" />
+		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="1">
+			<effect name="DamOverTime" ticks="7">
 				<param power="200" />
-				<sub stat="darkRes" val="60" />
 			</effect>
 		</for>
 	</skill>

trunk/dist/game/data/stats/skills/06800-06899.xml

@@ -237,14 +237,13 @@
 		</for>
 	</skill>
 	<skill id="6813" levels="8" name="Sonic Focus">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 43 49 55 60 66 70 79 </table>
 		<table name="#maxCharges"> 1 2 3 4 5 6 7 8 </table>
-		<set name="blockedInOlympiad" val="true" />
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
-		<set name="reuseDelay" val="10000" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="324">
@@ -259,13 +258,13 @@
 		</for>
 	</skill>
 	<skill id="6814" levels="8" name="Focus Force">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 24 32 40 52 60 66 72 79 </table>
 		<table name="#maxCharges"> 1 2 3 4 5 6 7 8 </table>
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
-		<set name="reuseDelay" val="10000" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="324">
@@ -1332,31 +1331,35 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6885" levels="3" name="Morale Boost">
-		<!-- "The persistence of the brave who fight together in Dragon Valley receive resistance to Paralysis/Bleed/Poison/Stun +90, Critical Rate +50%, Critical Damage +15%, P. Atk. +15%, M. Atk. +15%, Atk. Spd. +15%, Casting Spd. +15%, and EXP bonus +20%." -->
-		<!-- High Five Skill -->
-		<table name="#bonusExp"> 1 1 1.2 </table>
-		<table name="#cAtk"> 1.1 1.15 1.15 </table>
+		<!-- Confirmed High Five -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
+		<table name="#critDmg"> 1.1 1.15 1.2 </table>
 		<table name="#pmAtk"> 1 1.15 1.15 </table>
 		<table name="#pmAtkSpd"> 1 1 1.15 </table>
-		<table name="#rCrit"> 1.1 1.3 1.5 </table>
+		<table name="#critRate"> 1.1 1.3 1.5 </table>
 		<table name="#traits"> 50 80 90 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="60" />
+		<set name="abnormalType" val="DRAGON_BUFF" />
+		<set name="affectRange" val="1000" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="castRange" val="1500" />
 		<set name="effectPoint" val="100" />
+		<set name="effectRange" val="1800" />
 		<set name="icon" val="icon.skill6885" />
-		<set name="magicLvl" val="85" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="PARTY" />
 		<for>
 			<effect name="Buff">
-				<mul stat="critRate" val="#rCrit" />
-				<mul stat="critDmg" val="#cAtk" />
+				<mul stat="critRate" val="#critRate" />
+				<mul stat="critDmg" val="#critDmg" />
 				<mul stat="pAtk" val="#pmAtk" />
 				<mul stat="mAtk" val="#pmAtk" />
 				<mul stat="mAtkSpd" val="#pmAtkSpd" />
 				<mul stat="pAtkSpd" val="#pmAtkSpd" />
-				<mul stat="bonusExp" val="#bonusExp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param PARALYZE="#traits" />

trunk/dist/game/data/stats/skills/06900-06999.xml

@@ -90,14 +90,17 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6913" levels="1" name="Challenge of Faith">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
+		<set name="abnormalType" val="SUB_TRIGGER_DEFENCE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill0985" />
+		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="reuseDelay" val="45000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<for>
@@ -138,21 +141,25 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6920" levels="1" name="Collector's Fortune">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<!-- Triggered Skill for Collector's Experience -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="10" />
+		<set name="abnormalType" val="MULTI_BUFF_A" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="BranchSys2.icon.skill0952" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="74" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" /> <!-- FIXME: value unconfirmed -->
-		<set name="reuseDelay" val="15000" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE" />
+		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.15" />
-				<mul stat="critRate" val="1.1" />
+				<mul stat="critRate" val="1.15" />
 				<mul stat="critDmg" val="1.1" />
 				<mul stat="pAtkSpd" val="1.03" />
 				<add stat="runSpd" val="5" />
@@ -160,15 +167,32 @@
 		</for>
 	</skill>
 	<skill id="6921" levels="1" name="Penetrating Attack">
-		<!-- P. Def. is decreased momentarily. -->
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
+		<set name="abnormalType" val="PD_DOWN" />
 		<set name="activateRate" val="80" />
 		<set name="basicProperty" val="CON" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="-671" />
+		<set name="effectRange" val="400" />
+		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0122" />
-		<set name="operateType" val="PASSIVE" />
-		<set name="targetType" val="NONE" />
+		<set name="isDebuff" val="true" />
+		<set name="isTriggeredSkill" val="true" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="mpConsume" val="43" />
+		<set name="nextActionAttack" val="true" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="reuseDelay" val="30000" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="ONE" />
+		<for>
+			<effect name="Debuff">
+				<mul stat="pDef" val="0.77" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="6922" levels="3" name="Adventurer's Might">
 		<!-- AUTO GENERATED SKILL -->

trunk/dist/game/data/stats/skills/20000-20099.xml

@@ -73,8 +73,10 @@
 		</for>
 	</skill>
 	<skill id="20006" levels="1" name="Soul Roar">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
+		<set name="abnormalType" val="MULTI_DEBUFF_G" />
 		<set name="effectPoint" val="611" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="BranchSys2.icon.skill20006" />

trunk/dist/game/data/stats/skills/21200-21299.xml

@@ -513,6 +513,7 @@
 		<set name="hitTime" val="20000" />
 		<set name="icon" val="BranchSys2.Icon.br_zaken_cloak_i00" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="reuseDelay" val="1800000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -527,7 +528,7 @@
 		</cond>
 		<for>
 			<effect name="Teleport">
-				<param x="52195" y="218787" z="-3231" />
+				<param x="52201" y="218801" z="-3224" />
 			</effect>
 		</for>
 	</skill>
@@ -561,6 +562,7 @@
 		<set name="hitTime" val="20000" />
 		<set name="icon" val="BranchSys2.Icon.br_frintessa_cloak_i00" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="magicLvl" val="1" />
 		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="reuseDelay" val="1800000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -575,7 +577,7 @@
 		</cond>
 		<for>
 			<effect name="Teleport">
-				<param x="181378" y="-80915" z="-2731" />
+				<param x="181384" y="-80856" z="-2728" />
 			</effect>
 		</for>
 	</skill>
@@ -657,15 +659,15 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="21252" levels="1" name="Hellblade">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
+		<!-- Confirmed High Five -->
 		<set name="icon" val="BranchSys2.icon.br_wp_Caladbulg_i00" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="PASSIVE" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
-				<param minDamage="1" chance="3" />
+				<param minDamage="1" chance="15" />
 				<param skillId="23319" skillLevel="1" /> <!-- Blood Seeker -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
@@ -673,15 +675,15 @@
 		</for>
 	</skill>
 	<skill id="21253" levels="1" name="Butcher Blades">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
+		<!-- Confirmed High Five -->
 		<set name="icon" val="BranchSys2.icon.br_wp_habus_knife_i00" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="PASSIVE" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
-				<param minDamage="1" chance="3" />
+				<param minDamage="1" chance="15" />
 				<param skillId="23320" skillLevel="1" /> <!-- Greedy Throat -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
@@ -689,15 +691,15 @@
 		</for>
 	</skill>
 	<skill id="21254" levels="1" name="Claw of Destruction">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
+		<!-- Confirmed High Five -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i00" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="PASSIVE" />
 		<for>
 			<effect name="TriggerSkillByAttack">
-				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
-				<param minDamage="1" chance="3" />
+				<param minDamage="1" chance="15" />
 				<param skillId="23321" skillLevel="1" /> <!-- Draconic Evolver -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
@@ -705,47 +707,47 @@
 		</for>
 	</skill>
 	<skill id="21255" levels="1" name="Blades of Delusion">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
+		<!-- Confirmed High Five -->
 		<set name="icon" val="BranchSys2.icon.br_wp_astarot_i00" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="PASSIVE" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
-				<param minDamage="1" chance="3" />
-				<param skillId="23322" skillLevel="10" /> <!-- Demonic Desire -->
+				<param minDamage="1" chance="15" />
+				<param skillId="23322" skillLevel="1" /> <!-- Demonic Desire -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="21256" levels="1" name="Blood Brother">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
+		<!-- Confirmed High Five -->
 		<set name="icon" val="BranchSys2.icon.br_wp_tirbing_i00" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="PASSIVE" />
 		<for>
 			<effect name="TriggerSkillByAttack">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
 				<param isCritical="false" />
-				<param minDamage="1" chance="3" />
-				<param skillId="23323" skillLevel="10" /> <!-- Fury of Darkness -->
+				<param minDamage="1" chance="15" />
+				<param skillId="23323" skillLevel="1" /> <!-- Fury of Darkness -->
 				<param targetType="ONE" />
 				<param allowWeapons="ALL" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="21257" levels="1" name="Mardil">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
+		<!-- Confirmed High Five -->
 		<set name="icon" val="BranchSys2.icon.br_wp_wind_of_mardil_i00" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="PASSIVE" />
 		<for>
 			<effect name="TriggerSkillByDamage">
-				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="100" />
-				<param minDamage="1" />
-				<param chance="3" />
+				<param attackerType="L2Playable" minAttackerLevel="1" maxAttackerLevel="99" />
+				<param minDamage="100" />
+				<param chance="30" />
 				<param skillId="23324" skillLevel="1" /> <!-- Jet Black Typhoon -->
 				<param targetType="SELF" />
 			</effect>

trunk/dist/game/data/stats/skills/23300-23399.xml

@@ -150,82 +150,80 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="23319" levels="1" name="Blood Seeker">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
-		<set name="abnormalLvl" val="8" />
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="BLEEDING" />
-		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
 		<set name="activateRate" val="80" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="castRange" val="80" />
+		<set name="castRange" val="40" />
 		<set name="effectRange" val="400" />
+		<set name="hitTime" val="1500" />
 		<set name="icon" val="BranchSys2.icon.br_wp_Caladbulg_i00" />
 		<set name="isDebuff" val="true" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="isTriggeredSkill" val="true" />
-		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="85" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="power" val="5000" />
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
-		<set name="trait" val="BLEED" />
 		<for>
+			<effect name="PhysicalAttack" />
 			<effect name="DamOverTime" ticks="5">
-				<param power="170" />
+				<param power="105" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="23320" levels="1" name="Greedy Throat">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
-		<set name="abnormalLvl" val="8" />
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="60" />
 		<set name="abnormalType" val="BLEEDING" />
-		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
 		<set name="activateRate" val="80" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="castRange" val="80" />
+		<set name="castRange" val="40" />
 		<set name="effectRange" val="400" />
+		<set name="hitTime" val="1500" />
 		<set name="icon" val="BranchSys2.icon.br_wp_habus_knife_i00" />
 		<set name="isDebuff" val="true" />
 		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="isTriggeredSkill" val="true" />
 		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="80" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
-		<set name="trait" val="BLEED" />
 		<for>
 			<effect name="DamOverTime" ticks="5">
-				<param power="230" />
+				<param power="88" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="23321" levels="1" name="Draconic Evolver">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
-		<set name="abnormalLvl" val="1" />
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="15" />
 		<set name="abnormalType" val="TURN_FLEE" />
 		<set name="abnormalVisualEffect" val="TURN_FLEE" />
 		<set name="activateRate" val="80" />
 		<set name="basicProperty" val="MEN" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="castRange" val="80" />
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="-800" />
 		<set name="effectRange" val="400" />
+		<set name="hitTime" val="1500" />
 		<set name="icon" val="BranchSys2.icon.br_wp_tiatenon_i00" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="isTriggeredSkill" val="true" />
-		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="85" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="reuseDelay" val="10000" />
+		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="DERANGEMENT" />
@@ -233,26 +231,25 @@
 			<effect name="Fear" />
 		</for>
 	</skill>
-	<skill id="23322" levels="10" name="Demonic Desire">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
-		<!-- This skill only has one level, 10. -->
-		<set name="abnormalLvl" val="3" />
+	<skill id="23322" levels="1" name="Demonic Desire">
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="30" />
 		<set name="abnormalType" val="PD_DOWN" />
 		<set name="activateRate" val="80" />
 		<set name="basicProperty" val="MEN" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="castRange" val="80" />
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="-800" />
 		<set name="effectRange" val="400" />
+		<set name="hitTime" val="1500" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="isTriggeredSkill" val="true" />
-		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="76" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="reuseDelay" val="10000" />
+		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<for>
@@ -261,26 +258,26 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="23323" levels="10" name="Fury of Darkness">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
-		<!-- This skill only has one level, 10. -->
-		<set name="abnormalLvl" val="3" />
+	<skill id="23323" levels="1" name="Fury of Darkness">
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="9" />
-		<set name="abnormalType" val="PD_DOWN" />
+		<set name="abnormalType" val="STUN" />
+		<set name="abnormalVisualEffect" val="STUN" />
 		<set name="activateRate" val="80" />
 		<set name="basicProperty" val="CON" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="castRange" val="80" />
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="-800" />
 		<set name="effectRange" val="400" />
+		<set name="hitTime" val="1500" />
 		<set name="isDebuff" val="true" />
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="isTriggeredSkill" val="true" />
-		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="76" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="reuseDelay" val="10000" />
+		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="SHOCK" />
@@ -291,25 +288,28 @@
 		</for>
 	</skill>
 	<skill id="23324" levels="1" name="Jet Black Typhoon">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
-		<set name="abnormalLvl" val="1" />
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="7" />
 		<set name="abnormalTime" val="15" />
+		<set name="abnormalType" val="CASTING_TIME_DOWN" />
 		<set name="blockedInOlympiad" val="true" />
+		<!-- <set name="castRange" val="40" /> -->
 		<set name="effectPoint" val="800" />
+		<!-- <set name="effectRange" val="400" /> -->
+		<set name="element" val="2" /> <!-- Wind -->
+		<set name="elementPower" val="20" />
+		<set name="hitTime" val="1500" />
 		<set name="icon" val="BranchSys2.icon.br_wp_wind_of_mardil_i00" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
-		<!-- set name="abnormalType" val="RAID_WEAPON" / --> <!-- FIXME: Value unconfirmed. -->
-		<set name="isMagic" val="2" /> <!-- Static Skill -->
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="isTriggeredSkill" val="true" />
-		<set name="magicLvl" val="67" />
+		<set name="magicLvl" val="84" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="reuseDelay" val="10000" />
+		<set name="reuseDelay" val="5000" />
+		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="Buff">
-				<mul stat="mAtkSpd" val="1.15" />
-				<add stat="windPower" val="30" />
+				<mul stat="mAtkSpd" val="1.3" />
 			</effect>
 		</for>
 	</skill>

trunk/dist/game/data_classic/scripts/handlers/admincommandhandlers/AdminBuffs.java

@@ -26,6 +26,7 @@ import java.util.StringTokenizer;
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
+import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -160,47 +161,39 @@ public class AdminBuffs implements IAdminCommandHandler
 			StringTokenizer st = new StringTokenizer(command, " ");
 			command = st.nextToken();
 			
-			L2PcInstance player = null;
+			L2Character creature = null;
 			if (st.hasMoreTokens())
 			{
-				String playername = st.nextToken();
-				
-				try
+				creature = L2World.getInstance().getPlayer(st.nextToken());
+				if (creature == null)
 				{
-					player = L2World.getInstance().getPlayer(playername);
-				}
-				catch (Exception e)
-				{
-				}
-				
-				if (player == null)
-				{
-					activeChar.sendMessage("The player " + playername + " is not online.");
+					activeChar.sendMessage("The player " + creature + " is not online.");
 					return false;
 				}
 			}
-			else if ((activeChar.getTarget() != null) && activeChar.getTarget().isPlayer())
-			{
-				player = activeChar.getTarget().getActingPlayer();
-			}
 			else
 			{
-				activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
-				return false;
+				final L2Object target = activeChar.getTarget();
+				if ((target != null) && target.isCharacter())
+				{
+					creature = (L2Character) target;
+				}
+				
+				if (creature == null)
+				{
+					activeChar.sendPacket(SystemMessageId.THAT_IS_AN_INCORRECT_TARGET);
+					return false;
+				}
 			}
 			
-			try
+			creature.resetTimeStamps();
+			creature.resetDisabledSkills();
+			if (creature.isPlayer())
 			{
-				player.resetTimeStamps();
-				player.resetDisabledSkills();
-				player.sendPacket(new SkillCoolTime(player));
-				activeChar.sendMessage("Skill reuse was removed from " + player.getName() + ".");
-				return true;
-			}
-			catch (NullPointerException e)
-			{
-				return false;
+				creature.sendPacket(new SkillCoolTime(creature.getActingPlayer()));
 			}
+			activeChar.sendMessage("Skill reuse was removed from " + creature.getName() + ".");
+			return true;
 		}
 		else if (command.startsWith("admin_switch_gm_buffs"))
 		{

trunk/dist/game/data_classic/scripts/handlers/effecthandlers/MagicalAttackMp.java

@@ -68,7 +68,7 @@ public final class MagicalAttackMp extends AbstractEffect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.MAGICAL_ATTACK;
+		return L2EffectType.MAGICAL_ATTACK_MP;
 	}
 	
 	@Override

trunk/dist/game/data_classic/stats/skills/00900-00999.xml

@@ -1907,12 +1907,13 @@
 		</for>
 	</skill>
 	<skill id="984" levels="25" name="Shield Strike">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#effectPoints"> -377 -392 -407 -437 -453 -469 -501 -518 -535 -570 -588 -606 -643 -662 -681 -719 -738 -758 -777 -797 -816 -836 -856 -875 -895 </table>
 		<table name="#magicLvl"> 40 43 46 49 52 55 58 60 62 64 66 68 70 72 74 76 77 78 79 80 81 82 83 84 85 </table>
 		<table name="#mpConsume"> 38 41 44 48 51 55 58 61 62 65 67 69 71 73 75 77 78 78 79 80 80 81 82 82 83 </table>
 		<table name="#power"> 833 992 1171 1371 1592 1832 2091 2272 2460 2653 2850 3050 3252 3453 3653 3849 3945 4040 4133 4224 4312 4399 4482 4563 4640 </table>
 		<set name="castRange" val="40" />
+		<set name="coolTime" val="380" />
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="effectRange" val="400" />
 		<set name="hitTime" val="1080" />
@@ -1920,7 +1921,7 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="nextActionAttack" val="true" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="power" val="#power" />
 		<set name="reuseDelay" val="6000" />
 		<set name="rideState" val="NONE" />
@@ -1934,20 +1935,22 @@
 		</for>
 	</skill>
 	<skill id="985" levels="1" name="Challenge for Fate">
-		<!-- High Five Skill -->
-		<set name="abnormalTime" val="4" />
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="1" />
+		<set name="abnormalTime" val="5" />
+		<set name="abnormalType" val="TARGET_LOCK" />
 		<set name="affectLimit" val="10-10" />
-		<set name="affectRange" val="100" /> <!-- FIXME: value unconfirmed -->
-		<set name="castRange" val="400" />
-		<set name="effectPoint" val="-7987" />
-		<set name="effectRange" val="900" />
+		<set name="affectRange" val="550" />
+		<set name="effectPoint" val="-10000" />
 		<set name="hitTime" val="1000" />
 		<set name="icon" val="icon.skill0985" />
+		<set name="isDebuff" val="true" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="45000" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="AREA" />
+		<set name="staticReuse" val="true" />
+		<set name="targetType" val="AURA" />
 		<for>
 			<effect name="TargetMe" />
 			<effect name="GetAgro" />
@@ -1959,7 +1962,7 @@
 		</selfEffects>
 	</skill>
 	<skill id="986" levels="25" name="Deadly Strike">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 43 46 49 52 55 58 60 62 64 66 68 70 72 74 76 77 78 79 80 81 82 83 84 85 </table>
 		<table name="#mpConsume"> 38 41 44 48 51 55 58 61 62 65 67 69 71 73 75 77 78 78 79 80 80 81 82 82 83 </table>
 		<table name="#power"> 833 992 1171 1371 1592 1832 2091 2272 2460 2653 2850 3050 3252 3453 3653 3849 3945 4040 4133 4224 4312 4399 4482 4563 4640 </table>
@@ -1971,33 +1974,33 @@
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="nextActionAttack" val="true" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="overHit" val="true" />
 		<set name="power" val="#power" />
 		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
-			<not>
-				<using kind="FIST,DUALFIST,BOW,CROSSBOW" />
-			</not>
+			<using kind="SWORD,BLUNT,DAGGER,DUALDAGGER,DUAL,POLE" />
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
 		</for>
 	</skill>
 	<skill id="987" levels="1" name="Multiple Shot">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="affectLimit" val="5-12" />
-		<set name="affectRange" val="250" />
-		<set name="baseCritRate" val="15" /> <!-- FIXME: value unconfirmed -->
+		<set name="affectRange" val="900" />
+		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-887" />
-		<set name="effectRange" val="1400" />
+		<set name="effectRange" val="1100" />
+		<set name="fanRange" val="0,0,900,45" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill0987" />
 		<set name="magicLvl" val="82" />
 		<set name="mpConsume" val="162" />
+		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="overHit" val="true" />
 		<set name="power" val="16667" />
@@ -2012,21 +2015,26 @@
 		</for>
 	</skill>
 	<skill id="988" levels="3" name="Battle Whisper">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
+		<table name="#abnormalLvl"> 1 2 3 </table>
 		<table name="#amount"> 1.05 1.07 1.1 </table>
 		<table name="#effectPoints"> 454 523 635 </table>
 		<table name="#magicLvl"> 46 52 60 </table>
 		<table name="#pAtk"> 1.05 1.1 1.15 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="120" />
+		<set name="abnormalType" val="SONG_BATTLE_WHISPER" />
+		<!-- <set name="affectRange" val="1000" /> -->
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill0988" />
 		<set name="isMagic" val="3" /> <!-- Dance Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="30" />
+		<set name="mpInitialConsume" val="8" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="3000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="Buff">
@@ -2037,8 +2045,11 @@
 		</for>
 	</skill>
 	<skill id="989" levels="1" name="Defense Motion">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="120" />
+		<set name="abnormalType" val="DANCE_DEFENCE_MOTION1" />
+		<!-- <set name="affectRange" val="1000" /> -->
 		<set name="effectPoint" val="635" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill0989" />
@@ -2047,8 +2058,11 @@
 		<set name="mpConsume" val="30" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="3000" />
-		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
+		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
+		<cond msgId="113" addName="1">
+			<using kind="DUAL" />
+		</cond>
 		<for>
 			<effect name="Buff">
 				<mul stat="pDef" val="1.25" />
@@ -2057,9 +2071,9 @@
 			</effect>
 		</for>
 	</skill>
-	<skill id="990" levels="1" name="Death Sting">
-		<!-- High Five Skill -->
-		<set name="baseCritRate" val="15" /> <!-- FIXME: value unconfirmed -->
+	<skill id="990" levels="1" name="Death Shot">
+		<!-- Confirmed High Five -->
+		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-887" />
 		<set name="effectRange" val="1400" />
@@ -2081,19 +2095,20 @@
 		</for>
 	</skill>
 	<skill id="991" levels="1" name="Throwing Dagger">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="10" />
 		<set name="abnormalType" val="SPEED_DOWN" />
 		<set name="activateRate" val="40" />
+		<set name="baseCritRate" val="15" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="300" />
 		<set name="effectPoint" val="-569" />
-		<set name="effectRange" val="800" />
+		<set name="effectRange" val="500" />
 		<set name="hitTime" val="1080" />
 		<set name="icon" val="icon.skill0991" />
 		<set name="isDebuff" val="true" />
-		<set name="lvlBonusRate" val="2" /> <!-- FIXME: value unconfirmed -->
+		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="80" />
 		<set name="mpConsume" val="82" />
 		<set name="nextActionAttack" val="true" />
@@ -2113,15 +2128,20 @@
 		</for>
 	</skill>
 	<skill id="992" levels="8" name="Sonic Mastery">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 43 49 55 60 66 70 79 </table>
 		<table name="#skillLevel"> 1 2 3 4 5 6 7 8 </table>
 		<set name="icon" val="icon.skill0992" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="PASSIVE" />
+		<cond msgId="324">
+			<not>
+				<player Charges="#skillLevel" />
+			</not>
+		</cond>
 		<for>
 			<effect name="TriggerSkillByAttack">
-				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="15" />
 				<param skillId="6813" skillLevel="#skillLevel" /> <!-- Focus Sonic -->
@@ -2139,16 +2159,21 @@
 		</for>
 	</skill>
 	<skill id="993" levels="8" name="Force Mastery">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 24 32 40 52 60 66 72 79 </table>
 		<table name="#skillLevel"> 1 2 3 4 5 6 7 8 </table>
 		<set name="icon" val="icon.skill0993" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="PASSIVE" />
 		<set name="targetType" val="SELF" />
+		<cond msgId="324">
+			<not>
+				<player Charges="#skillLevel" />
+			</not>
+		</cond>
 		<for>
 			<effect name="TriggerSkillByAttack">
-				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="100" />
+				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param isCritical="false" />
 				<param minDamage="1" chance="15" />
 				<param skillId="6814" skillLevel="#skillLevel" /> <!-- Focus Force -->
@@ -2166,7 +2191,7 @@
 		</for>
 	</skill>
 	<skill id="994" levels="1" name="Rush">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="castRange" val="400" />
 		<set name="coolTime" val="200" />
 		<set name="effectPoint" val="-303" />
@@ -2174,8 +2199,8 @@
 		<set name="flyType" val="CHARGE" />
 		<set name="hitTime" val="800" />
 		<set name="icon" val="icon.skill0484" />
-		<set name="magicLvl" val="40" />
-		<set name="mpConsume" val="38" />
+		<set name="magicLvl" val="32" />
+		<set name="mpInitialConsume" val="20" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="DIRECTIONAL_INSTANT" />
 		<set name="reuseDelay" val="3000" />
@@ -2183,10 +2208,8 @@
 		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
 			<and>
+				<using kind="SWORD,BLUNT,DAGGER,DUALDAGGER,DUALFIST,DUAL,POLE" />
 				<target mindistance="200" />
-				<not>
-					<using kind="BOW,CROSSBOW" />
-				</not>
 			</and>
 		</cond>
 		<for>
@@ -2194,7 +2217,7 @@
 		</for>
 	</skill>
 	<skill id="995" levels="1" name="Rush Impact">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="9" />
 		<set name="abnormalType" val="STUN" />
@@ -2212,25 +2235,24 @@
 		<set name="icon" val="icon.skill0793" />
 		<set name="isDebuff" val="true" />
 		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="83" />
-		<set name="mpConsume" val="82" />
+		<set name="magicLvl" val="78" />
+		<set name="mpInitialConsume" val="83" />
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="DIRECTIONAL_CONTINUOUS" />
 		<set name="power" val="4224" />
 		<set name="reuseDelay" val="20000" />
 		<set name="rideState" val="NONE" />
+		<set name="soulMaxConsumeCount" val="5" />
 		<set name="targetType" val="FRONT_AREA" />
 		<set name="trait" val="SHOCK" />
 		<cond msgId="113" addName="1">
 			<and>
+				<using kind="SWORD,BLUNT,DAGGER,DUALDAGGER,DUALFIST,DUAL,POLE" />
 				<target mindistance="200" />
-				<not>
-					<using kind="BOW,CROSSBOW" />
-				</not>
 			</and>
 		</cond>
 		<for>
-			<effect name="PhysicalAttack" />
+			<effect name="PhysicalSoulAttack" />
 			<effect name="Stun" />
 		</for>
 	</skill>
@@ -2258,18 +2280,23 @@
 		</for>
 	</skill>
 	<skill id="997" levels="25" name="Crushing Strike">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 43 46 49 52 55 58 60 62 64 66 68 70 72 74 76 77 78 79 80 81 82 83 84 85 </table>
 		<table name="#mpConsume"> 38 41 44 48 51 55 58 61 62 65 67 69 71 73 75 77 78 78 79 80 80 81 82 82 83 </table>
 		<table name="#power"> 1041 1240 1464 1714 1990 2290 2614 2840 3075 3316 3563 3813 4065 4316 4566 4689 4811 4931 5050 5166 5280 5390 5498 5603 5704 </table>
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="3" />
+		<set name="abnormalType" val="MULTI_DEBUFF_G" />
 		<set name="activateRate" val="80" />
 		<set name="basicProperty" val="MEN" />
 		<set name="castRange" val="40" />
+		<set name="coolTime" val="200" />
 		<set name="effectPoint" val="-52" />
 		<set name="effectRange" val="400" />
 		<set name="hitTime" val="800" />
 		<set name="icon" val="icon.skill0997" />
+		<set name="isDebuff" val="true" />
+		<set name="lvlBonusRate" val="1" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="nextActionAttack" val="true" />
@@ -2291,26 +2318,25 @@
 		</for>
 	</skill>
 	<skill id="998" levels="1" name="Blazing Boost">
-		<!-- High Five Skill -->
-		<set name="castRange" val="400" />
-		<set name="coolTime" val="200" /> <!-- FIXME: value unconfirmed -->
+		<!-- Confirmed High Five -->
+		<set name="castRange" val="600" />
+		<set name="coolTime" val="200" />
 		<set name="effectPoint" val="-303" />
 		<set name="effectRange" val="900" />
 		<set name="flyType" val="CHARGE" />
 		<set name="hitTime" val="800" />
 		<set name="icon" val="icon.skill0998" />
 		<set name="magicLvl" val="40" />
-		<set name="mpConsume" val="38" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpInitialConsume" val="38" />
+		<set name="nextActionAttack" val="true" />
+		<set name="operateType" val="DIRECTIONAL_INSTANT" />
 		<set name="reuseDelay" val="3000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
 			<and>
-				<target mindistance="200" />
-				<not>
-					<using kind="BOW,CROSSBOW" />
-				</not>
+				<using kind="DAGGER,DUALDAGGER,SWORD,BLUNT,FIST" />
+				<target mindistance="400" />
 			</and>
 		</cond>
 		<for>

trunk/dist/game/data_classic/stats/skills/01500-01599.xml

@@ -1492,9 +1492,9 @@
 		</enchant3for>
 	</skill>
 	<skill id="1549" levels="1" name="Chant of Elements">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<!-- NOTE: skill desc says "increases the elemental attribute" but is client typo, it increase defense (see skill icon) -->
-		<set name="abnormalLvl" val="3" />
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="MD_UP_ATTR" />
 		<set name="affectRange" val="1000" />
@@ -1502,8 +1502,8 @@
 		<set name="icon" val="icon.skill1549" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="76" />
-		<set name="mpConsume" val="220" />
-		<set name="mpInitialConsume" val="55" />
+		<set name="mpConsume" val="55" />
+		<set name="mpInitialConsume" val="220" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="reuseDelay" val="5000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
@@ -1518,7 +1518,7 @@
 		</for>
 	</skill>
 	<skill id="1550" levels="1" name="Mass Cure Poison">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="affectRange" val="1000" />
 		<set name="effectPoint" val="1000" />
 		<set name="hitTime" val="4000" />
@@ -1538,7 +1538,7 @@
 		</for>
 	</skill>
 	<skill id="1551" levels="1" name="Mass Purify">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="affectRange" val="1000" />
 		<set name="effectPoint" val="1000" />
 		<set name="hitTime" val="3000" />
@@ -1553,31 +1553,31 @@
 		<set name="targetType" val="PARTY" />
 		<for>
 			<effect name="DispelBySlot">
-				<param dispel="POISON,9;BLEEDING,9;PARALYZE,1;TURN_STONE,1" />
+				<param dispel="POISON,9;BLEEDING,9;PARALYZE,9;TURN_STONE,9" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="1552" levels="1" name="Mass Vitalize">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="affectRange" val="1000" />
 		<set name="effectPoint" val="1000" />
 		<set name="hitTime" val="3000" />
 		<set name="icon" val="icon.skill1552" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="76" />
-		<set name="mpConsume" val="155" />
-		<set name="mpInitialConsume" val="38" />
+		<set name="mpConsume" val="38" />
+		<set name="mpInitialConsume" val="155" />
 		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="reuseDelay" val="9000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="PARTY" />
 		<for>
-			<effect name="Heal">
-				<param power="796" />
-			</effect>
 			<effect name="DispelBySlot">
 				<param dispel="POISON,9;BLEEDING,9" />
 			</effect>
+			<effect name="Heal">
+				<param power="796" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="1553" levels="1" name="Chain Heal">
@@ -1606,10 +1606,10 @@
 		</for>
 	</skill>
 	<skill id="1554" levels="1" name="Aura Blast">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalTime" val="3" />
 		<set name="affectLimit" val="2-10" />
-		<set name="affectRange" val="100" /> <!-- FIXME: value unconfirmed -->
+		<set name="affectRange" val="200" />
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-288" />
 		<set name="effectRange" val="1400" />
@@ -1617,9 +1617,9 @@
 		<set name="icon" val="icon.skill1554" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="81" />
-		<set name="mpConsume" val="116" />
-		<set name="mpInitialConsume" val="29" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpConsume" val="31" />
+		<set name="mpInitialConsume" val="145" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="power" val="199" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
 		<set name="pvpPower" val="141" />
 		<set name="reuseDelay" val="15000" />
@@ -1628,24 +1628,19 @@
 		<for>
 			<effect name="MagicalAttack" />
 		</for>
-		<selfEffects>
-			<effect name="ManaHeal">
-				<param power="10" />  <!-- FIXME: value unconfirmed -->
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="1555" levels="1" name="Aura Cannon">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="castRange" val="150" />
 		<set name="effectPoint" val="-993" />
-		<set name="effectRange" val="650" />
+		<set name="effectRange" val="600" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill1555" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="82" />
-		<set name="mpConsume" val="99" />
-		<set name="mpInitialConsume" val="24" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpConsume" val="27" />
+		<set name="mpInitialConsume" val="123" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="power" val="302" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
 		<set name="pvpPower" val="178" />
 		<set name="reuseDelay" val="10000" />
@@ -1654,11 +1649,6 @@
 		<for>
 			<effect name="MagicalAttack" />
 		</for>
-		<selfEffects>
-			<effect name="ManaHeal">
-				<param power="10" />  <!-- FIXME: value unconfirmed -->
-			</effect>
-		</selfEffects>
 	</skill>
 	<skill id="1556" levels="1" name="Arcane Shield">
 		<!-- High Five Skill -->
@@ -1682,7 +1672,7 @@
 		</for>
 	</skill>
 	<skill id="1557" levels="1" name="Servitor Share">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="SUMMON_CONDITION" />
@@ -1719,10 +1709,11 @@
 		</for>
 	</skill>
 	<skill id="1558" levels="24" name="Dimension Spiral">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 44 48 52 56 58 60 62 64 66 68 70 72 74 76 77 78 79 80 81 82 83 84 85 </table>
-		<table name="#mpConsume"> 38 43 47 50 53 55 57 59 60 63 64 67 74 83 92 99 100 106 109 115 118 119 125 134 </table>
-		<table name="#power"> 57 58 60 61 63 66 68 71 74 77 79 82 89 94 100 104 110 115 139 152 166 179 193 207 </table>
+		<table name="#mpConsume"> 31 35 38 40 43 44 46 48 48 51 52 54 60 67 74 80 80 85 88 92 95 96 100 108 </table>
+		<table name="#mpInitialConsume"> 7 8 9 10 10 11 11 11 12 12 12 13 14 16 18 19 20 21 21 23 23 23 25 26 </table>
+		<table name="#power"> 57 58 60 61 63 66 68 71 74 77 79 82 89 94 100 104 110 115 136 152 166 179 193 207 </table>
 		<table name="#pvpPower"> 57 58 60 61 63 66 68 71 74 77 79 82 84 87 89 90 91 92 93 94 95 96 97 98 </table>
 		<set name="castRange" val="900" />
 		<set name="effectPoint" val="-993" />
@@ -1732,7 +1723,8 @@
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="mpConsume" val="#mpConsume" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
+		<set name="mpInitialConsume" val="#mpInitialConsume" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="overHit" val="true" />
 		<set name="power" val="#power" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
 		<set name="pvpPower" val="#pvpPower" />
@@ -1741,18 +1733,12 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect name="TriggerSkillBySkill">
-				<param castSkillId="1558" /> <!-- Dimension Spiral -->
-				<param chance="5" />
-				<param skillId="5571" skillLevel="1" /> <!-- Mutual Response -->
-				<param targetType="SUMMON" />
-			</effect>
 		</for>
 	</skill>
 	<skill id="1559" levels="3" name="Potential Ability">
-		<!-- High Five Skill -->
-		<table name="#cAtkAdd"> 177 295 384 </table>
-		<table name="#magicLvl"> 28 40 49 </table>
+		<!-- Confirmed High Five -->
+		<table name="#cAtkAdd"> 117 295 384 </table>
+		<table name="#magicLvl"> 28 40 58 </table>
 		<table name="#rCrit"> 1.2 1.3 1.4 </table>
 		<set name="icon" val="icon.skill1559" />
 		<set name="magicLvl" val="#magicLvl" />
@@ -1761,26 +1747,23 @@
 		<for>
 			<effect name="Buff">
 				<mul stat="critRate" val="#rCrit">
-					<using kind="DAGGER,DUALDAGGER,LIGHT" />
+					<using kind="DAGGER,DUALDAGGER" />
 				</mul>
 				<add stat="critDmgAdd" val="#cAtkAdd">
-					<using kind="DAGGER,DUALDAGGER,LIGHT" />
+					<using kind="DAGGER,DUALDAGGER" />
 				</add>
 			</effect>
 		</for>
 	</skill>
 	<skill id="1560" levels="1" name="Lucky Blow">
-		<!-- High Five Skill -->
-		<set name="baseCritRate" val="30" />
-		<set name="blowChance" val="60" />
+		<!-- Confirmed High Five -->
+		<set name="baseCritRate" val="10" />
+		<set name="blowChance" val="30" />
 		<set name="castRange" val="40" />
-		<set name="coolTime" val="720" />
 		<set name="effectPoint" val="-337" />
 		<set name="effectRange" val="400" />
-		<set name="halfKillRate" val="8" />
 		<set name="hitTime" val="1800" />
 		<set name="icon" val="icon.skill1560" />
-		<set name="lethalStrikeRate" val="1" /> <!-- FIXME: unconfirmed -->
 		<set name="magicLvl" val="83" />
 		<set name="mpConsume" val="82" />
 		<set name="nextActionAttack" val="true" />
@@ -1796,18 +1779,22 @@
 		</cond>
 		<for>
 			<effect name="FatalBlow" />
+			<effect name="Lethal">
+				<param halfLethal="10" />
+				<param fullLethal="5" />
+			</effect>
 			<effect name="Spoil" />
 		</for>
 	</skill>
 	<skill id="1561" levels="5" name="Battle Cry">
-		<!-- High Five Skill -->
-		<table name="#abnormalLvls"> 2 3 4 5 6 </table>
+		<!-- Confirmed High Five -->
+		<table name="#abnormalLvls"> 1 2 3 4 5 </table>
 		<table name="#MaxHp"> 15 20 25 30 35 </table>
 		<table name="#magicLvl"> 40 49 58 64 70 </table>
 		<table name="#mpConsume"> 18 22 27 30 33 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="600" />
-		<set name="abnormalType" val="MAX_HP_UP" />
+		<set name="abnormalType" val="MAX_HP_CP_UP" />
 		<set name="effectPoint" val="268" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill1561" />
@@ -1826,17 +1813,15 @@
 		</for>
 	</skill>
 	<skill id="1562" levels="2" name="Chant of Berserker">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#abnormalLvls"> 1 2 </table>
+		<table name="#amount"> 1.05 1.08 </table>
 		<table name="#effectPoints"> 549 611 </table>
 		<table name="#magicLvl"> 44 52 </table>
 		<table name="#mAtk"> 1.1 1.16 </table>
-		<table name="#mAtkSpd"> 1.05 1.08 </table>
 		<table name="#mDef"> 0.9 0.84 </table>
-		<table name="#mpConsume"> 124 151 </table>
-		<table name="#mpInitialConsume"> 30 37 </table>
-		<table name="#pAtk"> 1.05 1.08 </table>
-		<table name="#pAtkSpd"> 1.05 1.08 </table>
+		<table name="#mpConsume"> 154 188 </table>
+		<table name="#mpInitialConsume"> 8 41 </table>
 		<table name="#pDef"> 0.95 0.92 </table>
 		<table name="#rEvas"> 2 4 </table>
 		<table name="#runSpd"> 5 8 </table>
@@ -1860,27 +1845,27 @@
 				<mul stat="pDef" val="#pDef" />
 				<mul stat="mDef" val="#mDef" />
 				<sub stat="rEvas" val="#rEvas" />
-				<mul stat="pAtk" val="#pAtk" />
+				<mul stat="pAtk" val="#amount" />
 				<mul stat="mAtk" val="#mAtk" />
-				<mul stat="pAtkSpd" val="#pAtkSpd" />
-				<mul stat="mAtkSpd" val="#mAtkSpd" />
+				<mul stat="pAtkSpd" val="#amount" />
+				<mul stat="mAtkSpd" val="#amount" />
 				<add stat="runSpd" val="#runSpd" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="1563" levels="2" name="Fury of Pa'agrio">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#abnormalLvls"> 1 2 </table>
 		<table name="#effectPoints"> 379 457 </table>
 		<table name="#magicLvl"> 48 56 </table>
-		<table name="#mpConsume"> 138 164 </table>
-		<table name="#mpInitialConsume"> 34 40 </table>
+		<table name="#mpConsume"> 172 204 </table>
+		<table name="#mpInitialConsume"> 28 35 </table>
 		<table name="#pAtkSpd"> 1.15 1.33 </table>
 		<set name="abnormalLvl" val="#abnormalLvls" />
 		<set name="abnormalTime" val="1200" />
 		<set name="abnormalType" val="ATTACK_TIME_DOWN" />
 		<set name="affectLimit" val="50-50" />
-		<set name="affectRange" val="900" />
+		<set name="affectRange" val="1000" />
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="hitTime" val="2500" />
 		<set name="icon" val="icon.skill1563" />
@@ -1908,14 +1893,14 @@
 			<effect name="TriggerSkillByDamage">
 				<param attackerType="L2Character" minAttackerLevel="1" maxAttackerLevel="99" />
 				<param minDamage="1" />
-				<param chance="5" />
+				<param chance="50" />
 				<param skillId="6921" skillLevel="1" /> <!-- Penetration Attack -->
 				<param targetType="ONE" />
 			</effect>
 		</for>
 	</skill>
 	<skill id="1565" levels="6" name="Mana Pump" enchantGroup1="1">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 49 58 64 68 72 </table>
 		<table name="#maxMp"> 70 100 140 150 180 200 </table>
 		<table name="#ench1maxMp"> 203 206 210 213 216 220 223 226 230 233 236 240 243 246 250 253 256 260 263 266 270 273 276 280 283 286 290 293 296 300 </table>

trunk/dist/game/data_classic/stats/skills/06700-06799.xml

@@ -540,34 +540,35 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6743" levels="1" name="Dark Wound">
-		<!-- High Five Skill -->
-		<!-- FIXME: value unconfirmed -->
-		<set name="abnormalLvl" val="1" />
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="3" />
 		<set name="abnormalTime" val="20" />
 		<set name="abnormalType" val="BLEEDING" />
 		<set name="abnormalVisualEffect" val="DOT_BLEEDING" />
 		<set name="activateRate" val="100" />
 		<set name="basicProperty" val="CON" />
 		<set name="blockedInOlympiad" val="true" />
-		<set name="castRange" val="1500" />
+		<set name="castRange" val="400" />
+		<set name="coolTime" val="300" />
 		<set name="effectPoint" val="-100" />
-		<set name="effectRange" val="2000" />
+		<set name="effectRange" val="900" />
+		<set name="element" val="5" /> <!-- Dark -->
+		<set name="elementPower" val="30" />
 		<set name="hitTime" val="2000" />
 		<set name="icon" val="icon.skill0096" />
 		<set name="isDebuff" val="true" />
 		<set name="isMagic" val="1" /> <!-- Magic Skill -->
-		<set name="lvlBonusRate" val="1" />
-		<set name="magicLvl" val="85" />
-		<set name="mpConsume" val="25" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="magicLvl" val="83" />
+		<set name="mpConsume" val="34" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="reuseDelay" val="5000" />
+		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
 		<set name="targetType" val="ONE" />
 		<set name="trait" val="BLEED" />
 		<for>
-			<effect name="DamOverTime" ticks="1">
+			<effect name="DamOverTime" ticks="7">
 				<param power="200" />
-				<sub stat="darkRes" val="60" />
 			</effect>
 		</for>
 	</skill>

trunk/dist/game/data_classic/stats/skills/06800-06899.xml

@@ -237,14 +237,13 @@
 		</for>
 	</skill>
 	<skill id="6813" levels="8" name="Sonic Focus">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 40 43 49 55 60 66 70 79 </table>
 		<table name="#maxCharges"> 1 2 3 4 5 6 7 8 </table>
-		<set name="blockedInOlympiad" val="true" />
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
-		<set name="reuseDelay" val="10000" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="324">
@@ -259,13 +258,13 @@
 		</for>
 	</skill>
 	<skill id="6814" levels="8" name="Focus Force">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<table name="#magicLvl"> 24 32 40 52 60 66 72 79 </table>
 		<table name="#maxCharges"> 1 2 3 4 5 6 7 8 </table>
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="operateType" val="ACTIVE_INSTANT" /> <!-- FIXME: value unconfirmed -->
-		<set name="reuseDelay" val="10000" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
+		<set name="reuseDelay" val="10000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<cond msgId="324">
@@ -1317,6 +1316,11 @@
 			<effect name="Petrification" />
 		</for>
 	</skill>
+	<skill id="6883" levels="1" name="Vitality Recovery Effect">
+		<!-- "For 5 minutes, energy is filled to stage 4. Returns to before as time goes on." -->
+		<set name="operateType" val="PASSIVE" />
+		<set name="targetType" val="NONE" />
+	</skill>
 	<skill id="6884" levels="1" name="Morale Boost">
 		<!-- none -->
 		<set name="abnormalTime" val="60" />
@@ -1327,31 +1331,35 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6885" levels="3" name="Morale Boost">
-		<!-- "The persistence of the brave who fight together in Dragon Valley receive resistance to Paralysis/Bleed/Poison/Stun +90, Critical Rate +50%, Critical Damage +15%, P. Atk. +15%, M. Atk. +15%, Atk. Spd. +15%, Casting Spd. +15%, and EXP bonus +20%." -->
-		<!-- High Five Skill -->
-		<table name="#bonusExp"> 1 1 1.2 </table>
-		<table name="#cAtk"> 1.1 1.15 1.15 </table>
+		<!-- Confirmed High Five -->
+		<table name="#abnormalLvl"> 2 3 4 </table>
+		<table name="#critDmg"> 1.1 1.15 1.2 </table>
 		<table name="#pmAtk"> 1 1.15 1.15 </table>
 		<table name="#pmAtkSpd"> 1 1 1.15 </table>
-		<table name="#rCrit"> 1.1 1.3 1.5 </table>
+		<table name="#critRate"> 1.1 1.3 1.5 </table>
 		<table name="#traits"> 50 80 90 </table>
+		<set name="abnormalLvl" val="#abnormalLvl" />
 		<set name="abnormalTime" val="60" />
+		<set name="abnormalType" val="DRAGON_BUFF" />
+		<set name="affectRange" val="1000" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="castRange" val="1500" />
 		<set name="effectPoint" val="100" />
+		<set name="effectRange" val="1800" />
 		<set name="icon" val="icon.skill6885" />
-		<set name="magicLvl" val="85" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
+		<set name="magicLvl" val="-1" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="rideState" val="NONE" />
-		<set name="targetType" val="ONE" />
+		<set name="targetType" val="PARTY" />
 		<for>
 			<effect name="Buff">
-				<mul stat="critRate" val="#rCrit" />
-				<mul stat="critDmg" val="#cAtk" />
+				<mul stat="critRate" val="#critRate" />
+				<mul stat="critDmg" val="#critDmg" />
 				<mul stat="pAtk" val="#pmAtk" />
 				<mul stat="mAtk" val="#pmAtk" />
 				<mul stat="mAtkSpd" val="#pmAtkSpd" />
 				<mul stat="pAtkSpd" val="#pmAtkSpd" />
-				<mul stat="bonusExp" val="#bonusExp" />
 			</effect>
 			<effect name="DefenceTrait">
 				<param PARALYZE="#traits" />

trunk/dist/game/data_classic/stats/skills/06900-06999.xml

@@ -77,14 +77,17 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6913" levels="1" name="Challenge of Faith">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="15" />
+		<set name="abnormalType" val="SUB_TRIGGER_DEFENCE" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="icon.skill0985" />
+		<set name="isMagic" val="2" /> <!-- Static Skill -->
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="83" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="reuseDelay" val="45000" />
 		<set name="rideState" val="NONE" />
 		<set name="targetType" val="SELF" />
 		<for>
@@ -125,21 +128,25 @@
 		<set name="targetType" val="NONE" />
 	</skill>
 	<skill id="6920" levels="1" name="Collector's Fortune">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
 		<!-- Triggered Skill for Collector's Experience -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="10" />
+		<set name="abnormalType" val="MULTI_BUFF_A" />
 		<set name="blockedInOlympiad" val="true" />
 		<set name="icon" val="BranchSys2.icon.skill0952" />
+		<set name="isMagic" val="1" /> <!-- Magic Skill -->
 		<set name="isTriggeredSkill" val="true" />
 		<set name="magicLvl" val="74" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" /> <!-- FIXME: value unconfirmed -->
-		<set name="reuseDelay" val="15000" /> <!-- FIXME: value unconfirmed -->
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="reuseDelay" val="15000" />
 		<set name="rideState" val="NONE" />
+		<set name="staticReuse" val="true" />
 		<set name="targetType" val="SELF" />
 		<for>
 			<effect name="Buff">
 				<mul stat="pAtk" val="1.15" />
-				<mul stat="critRate" val="1.1" />
+				<mul stat="critRate" val="1.15" />
 				<mul stat="critDmg" val="1.1" />
 				<mul stat="pAtkSpd" val="1.03" />
 				<add stat="runSpd" val="5" />
@@ -147,15 +154,32 @@
 		</for>
 	</skill>
 	<skill id="6921" levels="1" name="Penetrating Attack">
-		<!-- P. Def. is decreased momentarily. -->
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="30" />
+		<set name="abnormalType" val="PD_DOWN" />
 		<set name="activateRate" val="80" />
 		<set name="basicProperty" val="CON" />
 		<set name="blockedInOlympiad" val="true" />
+		<set name="castRange" val="40" />
 		<set name="effectPoint" val="-671" />
+		<set name="effectRange" val="400" />
+		<set name="hitTime" val="1500" />
 		<set name="icon" val="icon.skill0122" />
-		<set name="operateType" val="PASSIVE" />
-		<set name="targetType" val="NONE" />
+		<set name="isDebuff" val="true" />
+		<set name="isTriggeredSkill" val="true" />
+		<set name="lvlBonusRate" val="2" />
+		<set name="mpConsume" val="43" />
+		<set name="nextActionAttack" val="true" />
+		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="reuseDelay" val="30000" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="ONE" />
+		<for>
+			<effect name="Debuff">
+				<mul stat="pDef" val="0.77" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="6922" levels="3" name="Adventurer's Might">
 		<!-- AUTO GENERATED SKILL -->

trunk/dist/game/data_classic/stats/skills/20000-20099.xml

@@ -68,8 +68,10 @@
 		</for>
 	</skill>
 	<skill id="20006" levels="1" name="Soul Roar">
-		<!-- High Five Skill -->
+		<!-- Confirmed High Five -->
+		<set name="abnormalLvl" val="1" />
 		<set name="abnormalTime" val="600" />
+		<set name="abnormalType" val="MULTI_DEBUFF_G" />
 		<set name="effectPoint" val="611" />
 		<set name="hitTime" val="1500" />
 		<set name="icon" val="BranchSys2.icon.skill20006" />