From 6a820dfa13bbfe20c2aad826f6720ba490895bb9 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 28 Dec 2019 22:14:27 +0000
Subject: [PATCH] Classic Kamael skill updates - Part 1. Contributed by Iris.

---
 .../game/data/stats/skills/00200-00299.xml    |  8 ++
 .../game/data/stats/skills/00400-00499.xml    | 14 +--
 .../game/data/stats/skills/00900-00999.xml    | 18 +---
 .../game/data/stats/skills/01200-01299.xml    | 48 +++++-----
 .../game/data/stats/skills/01300-01399.xml    | 44 +++++++--
 .../game/data/stats/skills/01400-01499.xml    | 46 +++++-----
 .../game/data/stats/skills/01600-01699.xml    | 89 +++++++++++++++++--
 7 files changed, 184 insertions(+), 83 deletions(-)

diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00200-00299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00200-00299.xml
index aaab22fbf2..d4055a5943 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00200-00299.xml
@@ -7324,6 +7324,14 @@
 		<targetType>SELF</targetType>
 		<affectScope>POINT_BLANK</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
+		<conditions>
+			<condition name="EquipWeapon">
+				<weaponType>
+					<item>BLUNT</item>
+					<item>POLE</item>
+				</weaponType>
+			</condition>
+		</conditions>
 		<effects>
 			<effect name="DefenceTrait">
 				<POLE>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00400-00499.xml
index 5aa96df090..8bade7e807 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00400-00499.xml
@@ -2630,7 +2630,7 @@
 		<!-- Allows to evade P./ M. Skill for 1 min. -->
 		<icon>icon.skill0446</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>15</abnormalTime>
+		<abnormalTime>60</abnormalTime>
 		<abnormalType>AVOID_SKILL</abnormalType>
 		<effectPoint>337</effectPoint>
 		<hitTime>500</hitTime>
@@ -2645,7 +2645,11 @@
 		<effects>
 			<effect name="SkillEvasion">
 				<magicType>0</magicType>
-				<amount>90</amount>
+				<amount>70</amount>
+			</effect>
+			<effect name="SkillEvasion">
+				<magicType>1</magicType>
+				<amount>70</amount>
 			</effect>
 		</effects>
 	</skill>
@@ -2653,7 +2657,7 @@
 		<!-- For 40 sec., returns received 20% damage back to the enemy. -->
 		<icon>icon.skill0447</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>15</abnormalTime>
+		<abnormalTime>40</abnormalTime>
 		<abnormalType>COUNTER_SKILL</abnormalType>
 		<effectPoint>337</effectPoint>
 		<hitTime>500</hitTime>
@@ -2666,8 +2670,8 @@
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="CounterPhysicalSkill">
-				<amount>90</amount>
+			<effect name="DamageShield">
+				<amount>20</amount>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00900-00999.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00900-00999.xml
index 4369bcac8d..515b4a3a3f 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/00900-00999.xml
@@ -4781,7 +4781,7 @@
 		<!-- Attacks the enemy by throwing a dagger with 3488 Power added to P. Atk. and Speed -80% for 10 sec. Requires a dagger to be equipped. -->
 		<icon>icon.skill0991</icon>
 		<abnormalLvl>3</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
+		<abnormalTime>30</abnormalTime>
 		<abnormalType>SPEED_DOWN</abnormalType>
 		<activateRate>80</activateRate>
 		<basicProperty>MAGIC</basicProperty>
@@ -4876,7 +4876,7 @@
 				<maxAttackerLevel>100</maxAttackerLevel>
 				<targetType>SELF</targetType>
 				<minDamage>1</minDamage>
-				<chance>15</chance>
+				<chance>20</chance>
 			</effect>
 			<effect name="TriggerSkillByAttack">
 				<!-- Focus Sonic -->
@@ -4894,7 +4894,7 @@
 				</skillLevel>
 				<allowWeapons>DUAL,SWORD,BLUNT</allowWeapons>
 				<minDamage>1</minDamage>
-				<chance>30</chance>
+				<chance>40</chance>
 				<targetType>SELF</targetType>
 				<attackerType>Creature</attackerType>
 				<minAttackerLevel>1</minAttackerLevel>
@@ -5001,18 +5001,6 @@
 		<targetType>ENEMY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<conditions>
-			<condition name="EquipWeapon">
-				<weaponType>
-					<item>SWORD</item>
-					<item>BLUNT</item>
-					<item>DAGGER</item>
-					<item>POLE</item>
-					<item>DUALFIST</item>
-					<item>DUAL</item>
-					<item>DUALDAGGER</item>
-					<item>DUALBLUNT</item>
-				</weaponType>
-			</condition>
 			<condition name="OpCheckCastRange">
 				<distance>200</distance>
 			</condition>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01200-01299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01200-01299.xml
index 8e6a4f6c64..a6668ad685 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01200-01299.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01200-01299.xml
@@ -2865,7 +2865,7 @@
 			<value level="22">22</value>
 			<value level="23">23</value>
 		</abnormalLvl>
-		<abnormalTime>15</abnormalTime>
+		<abnormalTime>10</abnormalTime>
 		<abnormalType>LIFE_FORCE_ORC</abnormalType>
 		<affectRange>1000</affectRange>
 		<effectPoint>
@@ -2980,29 +2980,29 @@
 		<effects>
 			<effect name="HealOverTime">
 				<power>
-					<value level="1">12</value>
-					<value level="2">15</value>
-					<value level="3">18</value>
-					<value level="4">23</value>
-					<value level="5">27</value>
-					<value level="6">31</value>
-					<value level="7">35</value>
-					<value level="8">39</value>
-					<value level="9">43</value>
-					<value level="10">45</value>
-					<value level="11">46</value>
-					<value level="12">58</value>
-					<value level="13">50</value>
-					<value level="14">52</value>
-					<value level="15">53</value>
-					<value level="16">55</value>
-					<value level="17">56</value>
-					<value level="18">58</value>
-					<value level="19">60</value>
-					<value level="20">62</value>
-					<value level="21">64</value>
-					<value level="22">66</value>
-					<value level="23">68</value>
+					<value level="1">19</value>
+					<value level="2">24</value>
+					<value level="3">28</value>
+					<value level="4">33</value>
+					<value level="5">36</value>
+					<value level="6">41</value>
+					<value level="7">46</value>
+					<value level="8">49</value>
+					<value level="9">54</value>
+					<value level="10">59</value>
+					<value level="11">62</value>
+					<value level="12">67</value>
+					<value level="13">72</value>
+					<value level="14">75</value>
+					<value level="15">80</value>
+					<value level="16">84</value>
+					<value level="17">89</value>
+					<value level="18">94</value>
+					<value level="19">95</value>
+					<value level="20">99</value>
+					<value level="21">102</value>
+					<value level="22">103</value>
+					<value level="23">105</value>
 				</power>
 				<ticks>1</ticks>
 			</effect>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
index 3f014869bc..943b91f604 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01300-01399.xml
@@ -2434,8 +2434,8 @@
 		<hitTime>4000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<itemConsumeCount>
-			<value level="1">20</value>
-			<value level="2">30</value>
+			<value level="1">10</value>
+			<value level="2">20</value>
 		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLvl>
@@ -2532,8 +2532,8 @@
 		<hitTime>4000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<itemConsumeCount>
-			<value level="1">20</value>
-			<value level="2">30</value>
+			<value level="1">10</value>
+			<value level="2">20</value>
 		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLvl>
@@ -2613,8 +2613,8 @@
 		<hitTime>4000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<itemConsumeCount>
-			<value level="1">20</value>
-			<value level="2">30</value>
+			<value level="1">10</value>
+			<value level="2">20</value>
 		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLvl>
@@ -2638,6 +2638,34 @@
 			</condition>
 		</conditions>
 		<effects>
+			<effect name="MagicalEvasion">
+				<amount>
+					<value level="1">3</value>
+					<value level="2">4</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicAccuracy">
+				<amount>
+					<value level="1">3</value>
+					<value level="2">4</value>
+				</amount>
+				<mode>DIFF</mode>
+			</effect>
+			<effect name="MagicCriticalRate">
+				<amount>
+					<value level="1">10</value>
+					<value level="2">15</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MagicCriticalDamage">
+				<amount>
+					<value level="1">15</value>
+					<value level="2">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
 			<effect name="PhysicalEvasion">
 				<amount>
 					<value level="1">3</value>
@@ -2874,8 +2902,8 @@
 		<hitTime>2500</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<itemConsumeCount>
-			<value level="1">60</value>
-			<value level="2">70</value>
+			<value level="1">30</value>
+			<value level="2">40</value>
 		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLvl>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01400-01499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01400-01499.xml
index eeaaa5b4e1..30d453a9a9 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01400-01499.xml
@@ -450,7 +450,7 @@
 		<effectRange>1100</effectRange>
 		<hitTime>4000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
-		<itemConsumeCount>100</itemConsumeCount>
+		<itemConsumeCount>20</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLvl>77</magicLvl>
 		<mpConsume>58</mpConsume>
@@ -479,7 +479,7 @@
 		<effectRange>900</effectRange>
 		<hitTime>4000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
-		<itemConsumeCount>200</itemConsumeCount>
+		<itemConsumeCount>100</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLvl>79</magicLvl>
 		<mpConsume>87</mpConsume>
@@ -1174,7 +1174,7 @@
 		<blockedInOlympiad>true</blockedInOlympiad>
 		<hitTime>5000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
-		<itemConsumeCount>200</itemConsumeCount>
+		<itemConsumeCount>100</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLvl>80</magicLvl>
 		<mpConsume>72</mpConsume>
@@ -1239,16 +1239,16 @@
 		<hitTime>5000</hitTime>
 		<isMagic>1</isMagic> <!-- Magic Skill -->
 		<itemConsumeCount>
-			<value level="1">5</value>
-			<value level="2">5</value>
-			<value level="3">5</value>
-			<value level="4">5</value>
-			<value level="5">5</value>
-			<value level="6">7</value>
-			<value level="7">7</value>
-			<value level="8">7</value>
-			<value level="9">7</value>
-			<value level="10">7</value>
+			<value level="1">2</value>
+			<value level="2">2</value>
+			<value level="3">2</value>
+			<value level="4">2</value>
+			<value level="5">2</value>
+			<value level="6">3</value>
+			<value level="7">3</value>
+			<value level="8">3</value>
+			<value level="9">3</value>
+			<value level="10">3</value>
 		</itemConsumeCount>
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<magicLvl>
@@ -1286,16 +1286,16 @@
 		<effects>
 			<effect name="ManaHealByLevel">
 				<power>
-					<value level="1">240</value>
-					<value level="2">252</value>
-					<value level="3">265</value>
-					<value level="4">278</value>
-					<value level="5">292</value>
-					<value level="6">312</value>
-					<value level="7">334</value>
-					<value level="8">357</value>
-					<value level="9">382</value>
-					<value level="10">409</value>
+					<value level="1">264</value>
+					<value level="2">277</value>
+					<value level="3">292</value>
+					<value level="4">306</value>
+					<value level="5">321</value>
+					<value level="6">343</value>
+					<value level="7">367</value>
+					<value level="8">393</value>
+					<value level="9">420</value>
+					<value level="10">450</value>
 				</power>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml
index 0f0d74b996..659bbaff15 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/01600-01699.xml
@@ -427,7 +427,7 @@
 				</power>
 				<ignoreShieldDefence>true</ignoreShieldDefence>
 				<overHit>true</overHit>
-				<pDefMod>0.8</pDefMod>
+				<pDefMod>0.7</pDefMod>
 			</effect>
 		</effects>
 	</skill>
@@ -1245,13 +1245,86 @@
 			<effect name="PhysicalMute" />
 			<effect name="BlockTarget" />
 			<effect name="BlockMove" />
-			<effect name="ReduceDamage">
+			<effect name="PveMagicalSkillDefenceBonus">
 				<amount>
-					<value level="1" >50</value>
-					<value level="2" >40</value>
-					<value level="3" >30</value>
-					<value level="4" >20</value>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
 				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalAttackDefenceBonus">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvePhysicalSkillDefenceBonus">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PveRaidMagicalSkillDefenceBonus">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PveRaidPhysicalAttackDefenceBonus">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PveRaidPhysicalSkillDefenceBonus">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpMagicalSkillDefenceBonus">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalAttackDefenceBonus">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PvpPhysicalSkillDefenceBonus">
+				<amount>
+					<value level="1">50</value>
+					<value level="2">40</value>
+					<value level="3">30</value>
+					<value level="4">20</value>
+				</amount>
+				<mode>PER</mode>
 			</effect>
 		</effects>
 	</skill>
@@ -1434,7 +1507,7 @@
 		<!-- Throws a dagger at an enemy with bonus $s1 Power and injures their wrist. For $s2, there is a chance the wound will interrupt the target's skill casting. Requires a dagger. -->
 		<icon>icon.skill1629</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
+		<abnormalTime>60</abnormalTime>
 		<activateRate>80</activateRate>
 		<lvlBonusRate>20</lvlBonusRate>
 		<basicProperty>MAGIC</basicProperty>
@@ -1472,7 +1545,7 @@
 		<!-- Throws a dagger at an enemy with $s1 Power added to P. Atk. For $s2, with a certain probability, decreases target's HP when it tries to use skills. Requires a dagger. Over-hit. -->
 		<icon>icon.skill1630</icon>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>10</abnormalTime>
+		<abnormalTime>40</abnormalTime>
 		<abnormalType>CRITICAL_PROB_UP</abnormalType>
 		<activateRate>80</activateRate>
 		<lvlBonusRate>20</lvlBonusRate>