From 66fbf9ceb62b8ec580deca373a4a362c915a47b6 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 21 Jul 2015 12:45:16 +0000
Subject: [PATCH] -Corrected trigger from Scorpion Poison skill. -Some Yul
 skills update.

Contributed by NviX.
---
 .../ai/npc/NpcBuffers/NpcBuffersData.xml      |   3 +
 .../dist/game/data/stats/npcs/13300-13399.xml |  27 +++-
 .../game/data/stats/skills/10500-10599.xml    |   2 +-
 .../game/data/stats/skills/10700-10799.xml    | 148 ++++++++++--------
 .../game/data/stats/skills/10800-10899.xml    |  14 +-
 5 files changed, 114 insertions(+), 80 deletions(-)

diff --git a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xml b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xml
index 9c6e9ba6eb..594a96e55c 100644
--- a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xml
+++ b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.xml
@@ -116,4 +116,7 @@
 	<npc id="13381">
 		<skill id="10523" level="6" initialDelay="1" delay="2" affectScope="RANGE" affectObject="NOT_FRIEND" /> <!-- Poisoned -->
 	</npc>
+	<npc id="13328"> <!-- Virtual Image -->
+		<skill id="10808" level="1" delay="5" affectScope="RANGE" affectObject="NOT_FRIEND" /> <!-- Decoy Provocation -->
+	</npc>
 </list>
\ No newline at end of file
diff --git a/trunk/dist/game/data/stats/npcs/13300-13399.xml b/trunk/dist/game/data/stats/npcs/13300-13399.xml
index c2e2ad743b..d00ed86846 100644
--- a/trunk/dist/game/data/stats/npcs/13300-13399.xml
+++ b/trunk/dist/game/data/stats/npcs/13300-13399.xml
@@ -689,10 +689,13 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13328" level="99" type="L2Npc" name="Decoy">
-		<!-- Source http://l2i-god.gaikotsu.ru/ (Lindvior) -->
+	<npc id="13328" level="99" type="L2Decoy" name="Decoy">
+		<parameters>
+			<skill name="decoy_skill" id="10808" level="1" /> <!-- Decoy Provocation -->
+		</parameters>
 		<race>ETC</race>
-		<stats> <!-- str="88" int="79" dex="55" wit="78" con="82" men="78" -->
+		<sex>ETC</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="13881" hpRegen="7.5" mp="13881" mpRegen="2.7" />
 			<attack physical="971" magical="663" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="0" distance="80" width="120" />
 			<defence physical="341" magical="250" />
@@ -700,15 +703,25 @@
 				<defence fire="160" water="160" wind="160" earth="160" holy="160" dark="160" />
 			</attribute>
 			<speed>
-				<walk ground="1" />
+				<walk ground="50" />
 				<run ground="1" />
 			</speed>
-			<hit_time>333</hit_time>
 		</stats>
-		<status attackable="false" />
+		<status undying="false" hasSummoner="true" />
 		<skill_list>
-			<skill id="1627" level="1" />
+			<skill id="4390" level="1" /> <!-- NPC Abnormal Immunity -->
+			<skill id="4408" level="1" /> <!-- HP Increase (1x) -->
+			<skill id="4409" level="1" /> <!-- MP Increase (1x) -->
+			<skill id="4410" level="11" /> <!-- Average P. Atk. -->
+			<skill id="4411" level="11" /> <!-- Average M. Atk. -->
+			<skill id="4412" level="11" /> <!-- Average P. Def. -->
+			<skill id="4413" level="11" /> <!-- Average M. Def. -->
+			<skill id="4414" level="2" /> <!-- Standard Type -->
+			<skill id="4415" level="1" /> <!-- Bare Hands -->
+			<skill id="4416" level="19" /> <!-- Others -->
+			<skill id="10808" level="1" /> <!-- Decoy Provocation -->
 		</skill_list>
+		<ex_crt_effect>true</ex_crt_effect>
 		<collision>
 			<radius normal="8.5" />
 			<height normal="25" />
diff --git a/trunk/dist/game/data/stats/skills/10500-10599.xml b/trunk/dist/game/data/stats/skills/10500-10599.xml
index 585730a68e..05b239ea1a 100644
--- a/trunk/dist/game/data/stats/skills/10500-10599.xml
+++ b/trunk/dist/game/data/stats/skills/10500-10599.xml
@@ -1408,7 +1408,7 @@
 	<skill id="10535" levels="4" name="Scorpion Poison" enchantGroup1="10" enchantGroup2="10">
 		<!-- Need verify and correct enchant parameters -->
 		<table name="#magicLvl">85 90 95 99</table>
-		<table name="#triggerLvl1"> 1 1 2 2 </table>
+		<table name="#triggerLvl1"> 0 0 1 2 </table>
 		<table name="#triggerLvl2"> 1 2 3 4 </table>
 		<table name="#enchChance"> 16 17 18 19 20 21 22 23 24 25 </table>
 		<set name="targetType" val="SELF" />
diff --git a/trunk/dist/game/data/stats/skills/10700-10799.xml b/trunk/dist/game/data/stats/skills/10700-10799.xml
index b32440057f..5c2ffafc76 100644
--- a/trunk/dist/game/data/stats/skills/10700-10799.xml
+++ b/trunk/dist/game/data/stats/skills/10700-10799.xml
@@ -680,6 +680,7 @@
 		<set name="abnormalVisualEffect" val="STUN" />
 		<set name="activateRate" val="50" />
 		<set name="basicProperty" val="CON" />
+		<set name="baseCritRate" val="15" />
 		<set name="power" val="#power" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="lvlDepend" val="1" />
@@ -801,27 +802,29 @@
 			<effect name="TargetCancel" />
 		</for>
 	</skill>
-	<skill id="10771" levels="8" name="Multiple Arrow">
-		<set name="hitTime" val="2900" />
-		<set name="coolTime" val="350" />
-		<set name="castRange" val="1100" />
-		<set name="reuseDelay" val="7000" />
-		<set name="effectPoint" val="-1" />
+	<skill id="10771" levels="8" name="Multiple Arrow" enchantGroup1="10" enchantGroup2="10" enchantGroup3="10" enchantGroup4="10" enchantGroup5="10" enchantGroup6="10" enchantGroup7="10" enchantGroup8="10" enchantGroup9="10">
 		<table name="#mpConsume">124 128 133 137 142 146 151 155</table>
-		<set name="mpConsume" val="#mpConsume" />
 		<table name="#ench1MpConsume">145 136 127 117 108 99 89 80 71 62</table>
 		<table name="#enchelementPower">30 33 36 40 43 46 50 53 56 60</table>
 		<table name="#enchPower">35595 36408 37222 38035 38849 39662 40476 41290 42103 42917</table>
 		<table name="#magicLvl">85 87 89 91 93 95 97 99</table>
 		<table name="#power">23391 25018 26645 28272 29900 31527 33154 34781</table>
-		<set name="weaponsAllowed" val="Crossbow, Bow, TwohandCrossbow" />
+		<table name="#ench9Reuse"> 6900 6800 6700 6600 6500 6400 6300 6200 6100 6000 </table>
+		<set name="mpConsume" val="#mpConsume" />
 		<set name="power" val="#power" />
 		<set name="magicLvl" val="#magicLvl" />
-		<set name="targetType" val="AREA" />
-		<set name="skillRadius" val="300" />
+		<set name="targetType" val="FRONT_AREA" />
+		<set name="affectLimit" val="5-12" />
+		<set name="affectRange" val="250" />
+		<set name="baseCritRate" val="15" />
 		<set name="overHit" val="true" />
-		<set name="skillType" val="PDAM" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="hitTime" val="2900" />
+		<set name="coolTime" val="350" />
+		<set name="castRange" val="1100" />
+		<set name="effectRange" val="1600" />
+		<set name="reuseDelay" val="7000" />
+		<set name="effectPoint" val="-100" /> <!-- Need verify -->
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="nextActionAttack" val="true" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant1 name="power" val="#enchPower" />
@@ -844,35 +847,39 @@
 		<enchant8 name="element" val="5" />
 		<enchant8 name="elementPower" val="#enchelementPower" />
 		<enchant8 name="power" val="#enchPower" />
+		<enchant9 name="reuseDelay" val="#ench9Reuse" />
+		<enchant9 name="power" val="#enchPower" />
+		<cond msgId="113" addName="1">
+			<using kind="BOW, CROSSBOW" />
+		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
 		</for>
 	</skill>
-	<skill id="10772" levels="8" name="Heavy Arrow Rain">
-		<set name="hitTime" val="2900" />
-		<set name="coolTime" val="350" />
-		<set name="castRange" val="1100" />
-		<set name="effectPoint" val="-1" />
-		<table name="#reuseDelay">15000 15000 15000 15000 15000 15000 15000 15000</table>
-		<set name="reuseDelay" val="#reuseDelay" />
+	<skill id="10772" levels="8" name="Heavy Arrow Rain" enchantGroup1="10" enchantGroup2="10" enchantGroup3="10" enchantGroup4="10" enchantGroup5="10" enchantGroup6="10" enchantGroup7="10" enchantGroup8="10" enchantGroup9="10">
 		<table name="#mpConsume">125 127 131 136 140 145 149 154</table>
-		<set name="mpConsume" val="#mpConsume" />
 		<table name="#ench1MpConsume">144 135 126 117 107 98 89 80 70 61</table>
 		<table name="#magicLvl">85 86 88 90 92 94 96 98</table>
 		<table name="#power">22526 23310 24879 26448 28017 29586 31155 32724</table>
 		<table name="#enchelementPower">30 33 36 40 43 46 50 53 56 60</table>
 		<table name="#enchPower">34292 35077 35861 36646 37430 38215 38999 39784 40568 41353</table>
-		<set name="weaponsAllowed" val="Crossbow, Bow, TwohandCrossbow" />
+		<table name="#ench9Reuse"> 14000 13000 12000 11000 10000 9000 8000 7000 6000 5000 </table> <!-- Need verify -->
+		<set name="mpConsume" val="#mpConsume" />
 		<set name="power" val="#power" />
 		<set name="baseCritRate" val="15" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="targetType" val="AREA" />
 		<set name="overHit" val="true" />
-		<set name="skillType" val="PDAM" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="reuseDelay" val="15000" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="nextActionAttack" val="true" />
-		<set name="skillRadius" val="200" />
-		<set name="effectRange" val="900" />
+		<set name="affectLimit" val="5-12" />
+		<set name="affectRange" val="250" />
+		<set name="hitTime" val="2900" />
+		<set name="coolTime" val="350" />
+		<set name="castRange" val="1100" />
+		<set name="effectPoint" val="-100" />
+		<set name="effectRange" val="1600" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
 		<enchant1 name="power" val="#enchPower" />
 		<enchant2 name="pvpPower" val="#enchPower" />
@@ -894,12 +901,16 @@
 		<enchant8 name="element" val="5" />
 		<enchant8 name="elementPower" val="#enchelementPower" />
 		<enchant8 name="power" val="#enchPower" />
+		<enchant9 name="reuseDelay" val="#ench9Reuse" />
+		<enchant9 name="power" val="#enchPower" />
+		<cond msgId="113" addName="1">
+			<using kind="BOW, CROSSBOW" />
+		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
 		</for>
 	</skill>
 	<skill id="10773" levels="1" name="Not in Use">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Not in use -->
 		<set name="icon" val="icon.skill0773" />
 		<set name="operateType" val="ACTIVE_INSTANT" />
@@ -910,7 +921,7 @@
 		<set name="coolTime" val="300" />
 		<set name="reuseDelay" val="15000" />
 	</skill>
-	<skill id="10774" levels="4" name="Quick Evasion">
+	<skill id="10774" levels="4" name="Quick Evasion" enchantGroup1="10">
 		<table name="#mpConsume">27 32 33 33</table>
 		<table name="#castRange">300 350 400 450</table>
 		<table name="#magicLvl">85 90 95 99</table>
@@ -919,11 +930,9 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="flyCourse" val="0" />
 		<set name="flyRadius" val="#flyRadius" />
-		<set name="flyAnimationSpeed" val="333" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="castRange" val="#castRange" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="skillType" val="BUFF" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="targetType" val="SELF" />
 		<set name="reuseDelay" val="15000" />
 		<set name="hitTime" val="700" />
@@ -933,48 +942,48 @@
 		</for>
 	</skill>
 	<skill id="10775" levels="3" name="Confusion Decoy">
+		<table name="#mpConsume">60 66 72</table>
+		<table name="#ench1MpConsume">69 66 63 60 57 54 51 48 46 43</table>
+		<table name="#magicLvl">87 93 99</table>
+		<set name="mpConsume" val="#mpConsume" />
+		<set name="magicLvl" val="#magicLvl" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="hitTime" val="1000" />
 		<set name="coolTime" val="500" />
 		<set name="reuseDelay" val="600000" />
-		<table name="#mpConsume">60 66 72</table>
-		<set name="mpConsume" val="#mpConsume" />
-		<table name="#ench1MpConsume">69 66 63 60 57 54 51 48 46 43</table>
-		<table name="#magicLvl">87 93 99</table>
-		<table name="#summonTotalLifeTime">20000 23000 25000</table>
-		<set name="magicLvl" val="#magicLvl" />
-		<set name="npcId" val="13071" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="targetType" val="SELF" />
-		<set name="skillType" val="DECOY" />
-		<set name="castMagic" val="MAGIC" />
-		<set name="summonTotalLifeTime" val="#summonTotalLifeTime" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
+		<for>
+			<effect name="SummonNpc">
+				<param npcId="13328" npcCount="1" />
+			</effect>
+		</for>
 	</skill>
-	<skill id="10776" levels="4" name="Final Ultimate Escape">
-		<set name="hitTime" val="1000" />
-		<set name="coolTime" val="500" />
-		<set name="reuseDelay" val="900000" />
-		<set name="abnormalTime" val="30" />
-		<set name="icon" val="icon.skill10776" />
+	<skill id="10776" levels="4" name="Final Ultimate Escape" enchantGroup1="10" enchantGroup2="10" enchantGroup3="10" enchantGroup4="10" enchantGroup9="10">
 		<table name="#mpConsume">58 63 68 72</table>
-		<set name="mpConsume" val="#mpConsume" />
 		<table name="#ench1MpConsume">67 63 59 54 50 46 41 37 33 28</table>
 		<table name="#ench2abnormalTime">31 32 33 34 35 36 37 38 39 40</table>
-		<table name="#ench3windWalk">1 2 3 4 5 6 7 8 9 10</table>
-		<table name="#ench4stunProf">1 2 3 4 5 6 7 8 9 10</table>
+		<table name="#enchStat">1 2 3 4 5 6 7 8 9 10</table>
 		<table name="#magicLvl">85 90 95 99</table>
 		<table name="#rateEvas">60 70 80 90</table>
 		<table name="#rateEvasSkill">80 85 90 95</table>
-		<table name="#magicSuccRes">60 70 80 90</table>
 		<table name="#vuln">90 90 90 90</table>
+		<table name="#ench9Reuse"> 899 000 898000 897000 896000 895000 894000 893000 892000 891000 890000 </table> <!-- Need verify -->
+		<set name="icon" val="icon.skill10776" />
+		<set name="mpConsume" val="#mpConsume" />
+		<set name="abnormalTime" val="30" />
+		<set name="hitTime" val="1000" />
+		<set name="coolTime" val="500" />
+		<set name="reuseDelay" val="900000" />
 		<set name="targetType" val="SELF" />
-		<set name="skillType" val="BUFF" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
 		<set name="magicLvl" val="#magicLvl" />
 		<enchant1 name="mpConsume" val="#ench1MpConsume" />
+		<enchant2 name="abnormalTime" val="#ench2abnormalTime" />
+		<enchant9 name="reuseDelay" val="#ench9Reuse" />
 		<for>
 			<effect name="Buff">
-				<sub stat="cancelVuln" val="95" />
+				<sub stat="debuffVuln" val="95" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="rEvas" val="#rateEvas" />
 				<add stat="mEvas" val="#rateEvas" />
@@ -983,7 +992,7 @@
 		</for>
 		<enchant2for>
 			<effect name="Buff">
-				<sub stat="cancelVuln" val="95" />
+				<sub stat="debuffVuln" val="95" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="rEvas" val="90" />
 				<add stat="mEvas" val="90" />
@@ -992,47 +1001,50 @@
 		</enchant2for>
 		<enchant3for>
 			<effect name="Buff">
-				<sub stat="cancelVuln" val="95" />
+				<sub stat="debuffVuln" val="95" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="rEvas" val="90" />
 				<add stat="mEvas" val="90" />
 				<add stat="pSkillEvas" val="95" />
-				<add stat="runSpd" val="#ench3windWalk" />
+				<add stat="runSpd" val="#enchStat" />
 			</effect>
 		</enchant3for>
 		<enchant4for>
 			<effect name="Buff">
-				<sub stat="cancelVuln" val="95" />
+				<sub stat="debuffVuln" val="95" />
 				<mul stat="mDef" val="1.2" />
 				<add stat="rEvas" val="90" />
 				<add stat="mEvas" val="90" />
 				<add stat="pSkillEvas" val="95" />
-				<!-- <add stat="stunProf" val="#ench4stunProf" />-->
+			</effect>
+			<effect name="AttackTrait">
+				<param SHOCK="#enchStat" />
 			</effect>
 		</enchant4for>
 	</skill>
-	<skill id="10777" levels="1" name="Lure Shot">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Draws in the enemy's attention. -->
+	<skill id="10777" levels="1" name="Lure Shot" enchantGroup1="10">
+		<table name="#ench1mpConsume">73 70 67 64 61 58 55 52 49 46</table>
 		<set name="icon" val="icon.skill10777" />
 		<set name="hitTime" val="1500" />
-		<set name="coolTime" val="500" />
 		<set name="castRange" val="1100" />
 		<set name="reuseDelay" val="30000" />
 		<set name="abnormalTime" val="3" />
 		<set name="mpConsume" val="77" />
-		<table name="#ench1mpConsume">73 70 67 64 61 58 55 52 49 46</table>
 		<set name="magicLvl" val="99" />
-		<set name="power" val="1000" />
 		<set name="targetType" val="ONE" />
-		<set name="skillType" val="AGGDAMAGE" />
-		<set name="operateType" val="ACTIVE_CONTINUOUS" />
+		<set name="operateType" val="ACTIVE_INSTANT" />
 		<set name="isDebuff" val="true" />
-		<set name="effectRange" val="1100" />
-		<set name="weaponsAllowed" val="Crossbow, Bow, TwohandCrossbow" />
+		<set name="effectRange" val="1600" />
+		<set name="trait" val="DERANGEMENT" />
 		<enchant1 name="mpConsume" val="#ench1mpConsume" />
+		<cond msgId="113" addName="1">
+			<using kind="BOW, CROSSBOW" />
+		</cond>
 		<for>
 			<effect name="TargetMe" />
+			<effect name="AddHate">
+				<param power="1000" />
+			</effect>
 		</for>
 	</skill>
 	<!-- Level 1 : Transfer the aggression of nearby enemies around target to another party member. -->
diff --git a/trunk/dist/game/data/stats/skills/10800-10899.xml b/trunk/dist/game/data/stats/skills/10800-10899.xml
index 5dbd3c82a2..98ff777fc4 100644
--- a/trunk/dist/game/data/stats/skills/10800-10899.xml
+++ b/trunk/dist/game/data/stats/skills/10800-10899.xml
@@ -216,13 +216,19 @@
 		</for>-->
 	</skill>
 	<skill id="10808" levels="1" name="Decoy Provocation">
-		<!-- AUTO GENERATED SKILL -->
-		<!-- Decoy's provocation. Cannot change target. -->
 		<set name="icon" val="icon.skill0000" />
+		<set name="affectRange" val="200" />
+		<set name="effectPoint" val="-100" />
+		<set name="abnormalTime" val="3" />
+		<set name="hitTime" val="1200" />
+		<set name="magicLvl" val="99" />
 		<set name="operateType" val="ACTIVE_CONTINUOUS" />
-		<set name="targetType" val="SELF" />
-		<set name="hitTime" val="1000" />
 		<set name="isDebuff" val="true" />
+		<set name="rideState" val="NONE" />
+		<set name="targetType" val="AURA" />
+		<for>
+			<effect name="TargetMe" />
+		</for>
 	</skill>
 	<skill id="10809" levels="1" name="Survival Movement">
 		<set name="reuseDelay" val="30000" />