From bf15acc493e30f33c143951c92c71496aedb6672 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 28 Nov 2017 18:55:18 +0000
Subject: [PATCH] Protection Stone and Surrender to the Elemental fixes.
 Contributed by gamelike85.

---
 .../dist/game/data/stats/npcs/13400-13499.xml |   9 +-
 .../game/data/stats/skills/11200-11299.xml    |   1 +
 .../game/data/stats/skills/11300-11399.xml    |   3 +-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../dist/game/data/stats/npcs/13400-13499.xml |   9 +-
 .../game/data/stats/skills/11200-11299.xml    |   1 +
 .../game/data/stats/skills/11300-11399.xml    |   3 +-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../dist/game/data/stats/npcs/13400-13499.xml |   9 +-
 .../game/data/stats/skills/11200-11299.xml    |   1 +
 .../game/data/stats/skills/11300-11399.xml    | 158 +++++++++++++++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../dist/game/data/stats/npcs/13400-13499.xml |   9 +-
 .../game/data/stats/skills/11200-11299.xml    |   1 +
 .../game/data/stats/skills/11300-11399.xml    | 158 +++++++++++++++++-
 .../gameserver/model/skills/AbnormalType.java |   1 +
 .../gameserver/model/skills/AbnormalType.java |   1 +
 17 files changed, 327 insertions(+), 40 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/13400-13499.xml
index 5fe160dd69..53f9d2d4e5 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/13400-13499.xml
@@ -513,7 +513,6 @@
 		</collision>
 	</npc>
 	<npc id="13423" level="95" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -525,14 +524,13 @@
 			<attack physical="1690.0602700873" magical="1153.8640438614" critical="4" attackSpeed="253" range="40" />
 			<defence physical="395.65217391304" magical="289.49634093844" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="13424" level="97" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -544,14 +542,13 @@
 			<attack physical="1813.768861044" magical="1238.6677384381" critical="4" attackSpeed="253" range="40" />
 			<defence physical="401.0752688172" magical="293.48096099933" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="13425" level="99" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -563,7 +560,7 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
index 39d676524a..b89b237081 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11200-11299.xml
@@ -1392,6 +1392,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>GROUND</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11300-11399.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11300-11399.xml
index 28e59a4f64..2b2e8f19a1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11300-11399.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/11300-11399.xml
@@ -2508,7 +2508,7 @@
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A1</operateType>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
+		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<mpConsume>
 			<value level="1">137</value>
@@ -2516,6 +2516,7 @@
 			<value level="3">137</value>
 		</mpConsume>
 		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
 		<hitTime>1500</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>400000</reuseDelay>
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index ac46b9ee03..58a65a181c 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -77,6 +77,7 @@ public enum AbnormalType
 	CRIPPLING_DANCE(-1),
 	CRITICAL_SPECIAL(-1),
 	CURIOUS_HOUSE(-1),
+	CURSE_EXPOSURE(-1),
 	DAMAGE_AMPLIFY(-1),
 	DANCE_OF_BERSERKER(-1),
 	DC_MOD(-1),
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13400-13499.xml
index fbd24f2413..cab5e40562 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/13400-13499.xml
@@ -513,7 +513,6 @@
 		</collision>
 	</npc>
 	<npc id="13423" level="95" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -525,14 +524,13 @@
 			<attack physical="1690.0602700873" magical="1153.8640438614" critical="4" attackSpeed="253" range="40" />
 			<defence physical="395.65217391304" magical="289.49634093844" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="13424" level="97" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -544,14 +542,13 @@
 			<attack physical="1813.768861044" magical="1238.6677384381" critical="4" attackSpeed="253" range="40" />
 			<defence physical="401.0752688172" magical="293.48096099933" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="13425" level="99" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -563,7 +560,7 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
index 2e6fb7c043..b77956a970 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11200-11299.xml
@@ -1399,6 +1399,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>GROUND</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11300-11399.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11300-11399.xml
index 2e19d35f58..6cfafb50a5 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11300-11399.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/11300-11399.xml
@@ -2508,7 +2508,7 @@
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A1</operateType>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
+		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<mpConsume>
 			<value level="1">137</value>
@@ -2516,6 +2516,7 @@
 			<value level="3">137</value>
 		</mpConsume>
 		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
 		<hitTime>1500</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>400000</reuseDelay>
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index ac46b9ee03..58a65a181c 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -77,6 +77,7 @@ public enum AbnormalType
 	CRIPPLING_DANCE(-1),
 	CRITICAL_SPECIAL(-1),
 	CURIOUS_HOUSE(-1),
+	CURSE_EXPOSURE(-1),
 	DAMAGE_AMPLIFY(-1),
 	DANCE_OF_BERSERKER(-1),
 	DC_MOD(-1),
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13400-13499.xml
index a92d000174..208eee01aa 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/13400-13499.xml
@@ -513,7 +513,6 @@
 		</collision>
 	</npc>
 	<npc id="13423" level="95" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -525,14 +524,13 @@
 			<attack physical="1690.0602700873" magical="1153.8640438614" critical="4" attackSpeed="253" range="40" />
 			<defence physical="395.65217391304" magical="289.49634093844" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="13424" level="97" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -544,14 +542,13 @@
 			<attack physical="1813.768861044" magical="1238.6677384381" critical="4" attackSpeed="253" range="40" />
 			<defence physical="401.0752688172" magical="293.48096099933" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="13425" level="99" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -563,7 +560,7 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
index cbbeeba232..2954ff9071 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11200-11299.xml
@@ -1405,6 +1405,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>GROUND</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11300-11399.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11300-11399.xml
index 17cec85a70..02c1d14f26 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11300-11399.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/11300-11399.xml
@@ -2677,7 +2677,7 @@
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A1</operateType>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
+		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<mpConsume>
 			<value level="1">137</value>
@@ -2685,6 +2685,7 @@
 			<value level="3">137</value>
 		</mpConsume>
 		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
 		<hitTime>1500</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>400000</reuseDelay>
@@ -4173,13 +4174,156 @@
 		</effects>
 	</skill>
 	<skill id="11394" toLevel="4" name="Surrender to the Elemental">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<!-- Updated to Helios -->
+		<!-- Level: 1 Attacks the target with M. Atk. +249. For 10 seconds, all Attribute Def. -50. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 2 Attacks the target with M. Atk. +256. For 10 seconds, all Attribute Def. -50. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 3 Attacks the target with M. Atk. +264. For 10 seconds, all Attribute Def. -50. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 4 Attacks the target with M. Atk. +272. For 10 seconds, all Attribute Def. -50. Consumes 1 Spirit Ore(s). -->
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+		</abnormalLvl>
+		<abnormalType>MD_DOWN_AWAKEN</abnormalType>
+		<abnormalTime>10</abnormalTime>
+		<activateRate>
+			<value fromLevel="1" toLevel="4">80</value> <!-- Guessed -->
+			<value fromLevel="1" toLevel="4" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
+		</activateRate>
+		<basicProperty>NONE</basicProperty>
+		<icon>icon.skill11394</icon>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<operateType>A2</operateType>
+		<magicLvl>
+			<value level="1">99</value>
+			<value level="2">101</value>
+			<value level="3">103</value>
+			<value level="4">105</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">86</value>
+			<value level="2">88</value>
+			<value level="3">90</value>
+			<value level="4">92</value>
+		</mpConsume>
+		<castRange>1100</castRange>
+		<hitTime>2780</hitTime>
+		<coolTime>300</coolTime>
+		<reuseDelay>5000</reuseDelay>
+		<effectPoint>-328</effectPoint>
+		<isMagic>1</isMagic>
+		<isDebuff>1</isDebuff>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>
+					<value level="1">249</value>
+					<value level="2">256</value>
+					<value level="3">264</value>
+					<value level="4">272</value>
+					<value fromLevel="1" toLevel="4" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
+				</power>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="PhysicalDefence" fromLevel="1" toLevel="4" fromSubLevel="3001" toSubLevel="3020">
+				<amount>
+					<value fromLevel="1" toLevel="4" fromSubLevel="3001" toSubLevel="3020">{-0.6 - 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="11395" toLevel="4" name="Curse Exposure">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<!-- Updated to Helios -->
+		<!-- Level: 1 Attacks the target with M. Atk. +249. For 30 seconds, Deadly Attack Def. -30%. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 2 Attacks the target with M. Atk. +256. For 30 seconds, Deadly Attack Def. -30%. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 3 Attacks the target with M. Atk. +264. For 30 seconds, Deadly Attack Def. -30%. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 4 Attacks the target with M. Atk. +272. For 30 seconds, Deadly Attack Def. -30%. Consumes 1 Spirit Ore(s). -->
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+		</abnormalLvl>
+		<abnormalType>CURSE_EXPOSURE</abnormalType>
+		<abnormalTime>30</abnormalTime>
+		<activateRate>
+			<value fromLevel="1" toLevel="4">80</value> <!-- Guessed -->
+			<value fromLevel="1" toLevel="4" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
+		</activateRate>
+		<basicProperty>NONE</basicProperty>
+		<icon>icon.skill11395</icon>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<operateType>A2</operateType>
+		<magicLvl>
+			<value level="1">99</value>
+			<value level="2">101</value>
+			<value level="3">103</value>
+			<value level="4">105</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">86</value>
+			<value level="2">88</value>
+			<value level="3">90</value>
+			<value level="4">92</value>
+		</mpConsume>
+		<castRange>1100</castRange>
+		<hitTime>2780</hitTime>
+		<coolTime>300</coolTime>
+		<reuseDelay>5000</reuseDelay>
+		<effectPoint>-671</effectPoint>
+		<isMagic>1</isMagic>
+		<isDebuff>1</isDebuff>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>
+					<value level="1">249</value>
+					<value level="2">256</value>
+					<value level="3">264</value>
+					<value level="4">272</value>
+					<value fromLevel="1" toLevel="4" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
+				</power>
+			</effect>
+			<effect name="InstantKillResist">
+				<amount>-30</amount>
+			</effect>
+			<effect name="PhysicalDefence" fromLevel="1" toLevel="4" fromSubLevel="3001" toSubLevel="3020">
+				<amount>
+					<value fromLevel="1" toLevel="4" fromSubLevel="3001" toSubLevel="3020">{-0.6 - 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index ac46b9ee03..58a65a181c 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -77,6 +77,7 @@ public enum AbnormalType
 	CRIPPLING_DANCE(-1),
 	CRITICAL_SPECIAL(-1),
 	CURIOUS_HOUSE(-1),
+	CURSE_EXPOSURE(-1),
 	DAMAGE_AMPLIFY(-1),
 	DANCE_OF_BERSERKER(-1),
 	DC_MOD(-1),
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13400-13499.xml
index 1a20c77d30..b428c134f1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/npcs/13400-13499.xml
@@ -513,7 +513,6 @@
 		</collision>
 	</npc>
 	<npc id="13423" level="95" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -525,14 +524,13 @@
 			<attack physical="1690.0602700873" magical="1153.8640438614" critical="4" attackSpeed="253" range="40" />
 			<defence physical="395.65217391304" magical="289.49634093844" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="13424" level="97" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -544,14 +542,13 @@
 			<attack physical="1813.768861044" magical="1238.6677384381" critical="4" attackSpeed="253" range="40" />
 			<defence physical="401.0752688172" magical="293.48096099933" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="13425" level="99" type="L2Npc" name="Protection Stone">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -563,7 +560,7 @@
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
-		<status attackable="true" hasSummoner="true" />
+		<status attackable="false" hasSummoner="true" targetable="false" showName="false" />
 		<collision>
 			<radius normal="12" />
 			<height normal="20" />
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml
index 14d5e884cf..b92142d872 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11200-11299.xml
@@ -1397,6 +1397,7 @@
 		<staticReuse>true</staticReuse>
 		<targetType>GROUND</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
 			<effect name="SummonNpc">
 				<npcId>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11300-11399.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11300-11399.xml
index 4891f33ce8..e0f8e4f7b9 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11300-11399.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11300-11399.xml
@@ -2627,7 +2627,7 @@
 		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
 		<operateType>A1</operateType>
 		<targetType>GROUND</targetType>
-		<affectScope>POINT_BLANK</affectScope>
+		<affectScope>SINGLE</affectScope>
 		<affectObject>FRIEND</affectObject>
 		<mpConsume>
 			<value level="1">137</value>
@@ -2635,6 +2635,7 @@
 			<value level="3">137</value>
 		</mpConsume>
 		<castRange>900</castRange>
+		<effectRange>1100</effectRange>
 		<hitTime>1500</hitTime>
 		<coolTime>500</coolTime>
 		<reuseDelay>400000</reuseDelay>
@@ -4123,13 +4124,156 @@
 		</effects>
 	</skill>
 	<skill id="11394" toLevel="4" name="Surrender to the Elemental">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<!-- Updated to Helios -->
+		<!-- Level: 1 Attacks the target with M. Atk. +249. For 10 seconds, all Attribute Def. -50. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 2 Attacks the target with M. Atk. +256. For 10 seconds, all Attribute Def. -50. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 3 Attacks the target with M. Atk. +264. For 10 seconds, all Attribute Def. -50. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 4 Attacks the target with M. Atk. +272. For 10 seconds, all Attribute Def. -50. Consumes 1 Spirit Ore(s). -->
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+		</abnormalLvl>
+		<abnormalType>MD_DOWN_AWAKEN</abnormalType>
+		<abnormalTime>10</abnormalTime>
+		<activateRate>
+			<value fromLevel="1" toLevel="4">80</value> <!-- Guessed -->
+			<value fromLevel="1" toLevel="4" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
+		</activateRate>
+		<basicProperty>NONE</basicProperty>
+		<icon>icon.skill11394</icon>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<operateType>A2</operateType>
+		<magicLvl>
+			<value level="1">99</value>
+			<value level="2">101</value>
+			<value level="3">103</value>
+			<value level="4">105</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">86</value>
+			<value level="2">88</value>
+			<value level="3">90</value>
+			<value level="4">92</value>
+		</mpConsume>
+		<castRange>1100</castRange>
+		<hitTime>2780</hitTime>
+		<coolTime>300</coolTime>
+		<reuseDelay>5000</reuseDelay>
+		<effectPoint>-328</effectPoint>
+		<isMagic>1</isMagic>
+		<isDebuff>1</isDebuff>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>
+					<value level="1">249</value>
+					<value level="2">256</value>
+					<value level="3">264</value>
+					<value level="4">272</value>
+					<value fromLevel="1" toLevel="4" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
+				</power>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>FIRE</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>WATER</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>WIND</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>EARTH</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>HOLY</attribute>
+			</effect>
+			<effect name="DefenceAttribute">
+				<amount>-50</amount>
+				<attribute>DARK</attribute>
+			</effect>
+			<effect name="PhysicalDefence" fromLevel="1" toLevel="4" fromSubLevel="3001" toSubLevel="3020">
+				<amount>
+					<value fromLevel="1" toLevel="4" fromSubLevel="3001" toSubLevel="3020">{-0.6 - 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="11395" toLevel="4" name="Curse Exposure">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
-		<operateType>A1</operateType>
+		<!-- Updated to Helios -->
+		<!-- Level: 1 Attacks the target with M. Atk. +249. For 30 seconds, Deadly Attack Def. -30%. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 2 Attacks the target with M. Atk. +256. For 30 seconds, Deadly Attack Def. -30%. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 3 Attacks the target with M. Atk. +264. For 30 seconds, Deadly Attack Def. -30%. Consumes 1 Spirit Ore(s). -->
+		<!-- Level: 4 Attacks the target with M. Atk. +272. For 30 seconds, Deadly Attack Def. -30%. Consumes 1 Spirit Ore(s). -->
+		<abnormalLvl>
+			<value level="1">1</value>
+			<value level="2">2</value>
+			<value level="3">3</value>
+			<value level="4">4</value>
+		</abnormalLvl>
+		<abnormalType>CURSE_EXPOSURE</abnormalType>
+		<abnormalTime>30</abnormalTime>
+		<activateRate>
+			<value fromLevel="1" toLevel="4">80</value> <!-- Guessed -->
+			<value fromLevel="1" toLevel="4" fromSubLevel="2001" toSubLevel="2020">{base + base / 100 * subIndex}</value>
+		</activateRate>
+		<basicProperty>NONE</basicProperty>
+		<icon>icon.skill11395</icon>
+		<itemConsumeCount>1</itemConsumeCount>
+		<itemConsumeId>3031</itemConsumeId> <!-- Spirit Ore -->
+		<operateType>A2</operateType>
+		<magicLvl>
+			<value level="1">99</value>
+			<value level="2">101</value>
+			<value level="3">103</value>
+			<value level="4">105</value>
+		</magicLvl>
+		<mpConsume>
+			<value level="1">86</value>
+			<value level="2">88</value>
+			<value level="3">90</value>
+			<value level="4">92</value>
+		</mpConsume>
+		<castRange>1100</castRange>
+		<hitTime>2780</hitTime>
+		<coolTime>300</coolTime>
+		<reuseDelay>5000</reuseDelay>
+		<effectPoint>-671</effectPoint>
+		<isMagic>1</isMagic>
+		<isDebuff>1</isDebuff>
+		<targetType>ENEMY</targetType>
+		<affectScope>SINGLE</affectScope>
+		<magicCriticalRate>5</magicCriticalRate>
+		<effects>
+			<effect name="MagicalAttack">
+				<power>
+					<value level="1">249</value>
+					<value level="2">256</value>
+					<value level="3">264</value>
+					<value level="4">272</value>
+					<value fromLevel="1" toLevel="4" fromSubLevel="1001" toSubLevel="1020">{base + base / 100 * subIndex}</value>
+				</power>
+			</effect>
+			<effect name="InstantKillResist">
+				<amount>-30</amount>
+			</effect>
+			<effect name="PhysicalDefence" fromLevel="1" toLevel="4" fromSubLevel="3001" toSubLevel="3020">
+				<amount>
+					<value fromLevel="1" toLevel="4" fromSubLevel="3001" toSubLevel="3020">{-0.6 - 0.4 * subIndex}</value>
+				</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index 3c47a311bf..69f27d1afc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -80,6 +80,7 @@ public enum AbnormalType
 	CRIPPLING_DANCE(-1),
 	CRITICAL_SPECIAL(-1),
 	CURIOUS_HOUSE(-1),
+	CURSE_EXPOSURE(-1),
 	DAMAGE_AMPLIFY(-1),
 	DANCE_OF_BERSERKER(-1),
 	DC_MOD(-1),
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
index ac46b9ee03..58a65a181c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java
@@ -77,6 +77,7 @@ public enum AbnormalType
 	CRIPPLING_DANCE(-1),
 	CRITICAL_SPECIAL(-1),
 	CURIOUS_HOUSE(-1),
+	CURSE_EXPOSURE(-1),
 	DAMAGE_AMPLIFY(-1),
 	DANCE_OF_BERSERKER(-1),
 	DC_MOD(-1),