From 121469cc9704d264bdec6676eb5d11ca6466016a Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 15 Nov 2017 22:27:09 +0000
Subject: [PATCH] Previous commit for Ertheia and Underground branches.

---
 .../game/data/spawns/Kamael/NornilsCave.xml   |  5 ----
 .../dist/game/data/spawns/RaidbossSpawns.xml  |  3 +++
 .../dist/game/data/stats/npcs/25900-25999.xml | 25 ++++++++++++++++---
 .../game/data/spawns/Kamael/NornilsCave.xml   |  5 ----
 .../dist/game/data/spawns/RaidbossSpawns.xml  |  3 +++
 .../dist/game/data/stats/npcs/23700-23799.xml |  5 ++--
 .../dist/game/data/stats/npcs/25900-25999.xml | 25 ++++++++++++++++---
 .../dist/game/data/stats/npcs/26100-26199.xml |  6 +++++
 8 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Kamael/NornilsCave.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Kamael/NornilsCave.xml
index f29e86007a..0d65fd61ad 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Kamael/NornilsCave.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Kamael/NornilsCave.xml
@@ -106,11 +106,6 @@
 			<npc id="23302" x="-85179" y="53508" z="-4592" heading="52286" respawnTime="60sec" /> <!-- Laido Golem of Repairs -->
 			<npc id="23302" x="-86604" y="52713" z="-4312" heading="49731" respawnTime="60sec" /> <!-- Laido Golem of Repairs -->
 			<npc id="23302" x="-86545" y="53459" z="-4312" heading="57798" respawnTime="60sec" /> <!-- Laido Golem of Repairs -->
-			<npc id="25937" x="-84084" y="59598" z="-2608" respawnTime="60sec" /> <!-- Spicula Negative -->
-			<npc id="25938" x="-83728" y="59885" z="-2608" respawnTime="60sec" /> <!-- Spicula Fighter Minion -->
-			<npc id="25938" x="-83893" y="59730" z="-2608" respawnTime="60sec" /> <!-- Spicula Fighter Minion -->
-			<npc id="25939" x="-83480" y="60186" z="-2600" respawnTime="60sec" /> <!-- Spicula Archer Minion -->
-			<npc id="25939" x="-83588" y="60083" z="-2600" respawnTime="60sec" /> <!-- Spicula Archer Minion -->
 			<npc id="33781" x="-83205" y="50976" z="-4728" respawnTime="60sec" /> <!-- Boz Core -->
 			<npc id="33790" x="-86832" y="42912" z="-2664" heading="8224" respawnTime="60sec" > <!-- Nornil Teleport Device -->
 				<parameters>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/RaidbossSpawns.xml
index e97ac87826..0ccc17a238 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/RaidbossSpawns.xml
@@ -1934,4 +1934,7 @@
 	<spawn>
 		<npc id="25927" x="-18328" y="-114704" z="-4088" heading="8331" dbSave="true" dbName="Krogel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Krogel -->
 	</spawn>
+	<spawn>
+		<npc id="25937" x="-84084" y="59598" z="-2608" heading="0" dbSave="true" dbName="Spicula Negative" respawnTime="24Hour" respawnRandom="12hour" /> <!-- Spicula Negative -->
+	</spawn>	
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25900-25999.xml
index 63d7f79d5d..fccaae7b22 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/npcs/25900-25999.xml
@@ -1657,7 +1657,12 @@
 		</collision>
 	</npc>
 	<npc id="25937" level="95" type="L2RaidBoss" name="Spicula Negative" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<minions name="Privates">
+				<npc id="25938" count="2" respawnTime="360" weightPoint="1" />
+				<npc id="25939" count="2" respawnTime="360" weightPoint="1" />
+			</minions>
+		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<acquire exp="4142475000" sp="994194" raidPoints="30" />
@@ -1673,7 +1678,6 @@
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
 		<skill_list>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
@@ -1730,6 +1734,11 @@
 				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky_drop>
 		</drop_lists>
+		<ai type="BALANCED" clanHelpRange="1000" aggroRange="600">
+			<clan_list>
+				<clan>SPICULA_NEGATIVE</clan>
+			</clan_list>
+		</ai>
 		<collision>
 			<radius normal="20" />
 			<height normal="40" />
@@ -1756,6 +1765,11 @@
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 		</skill_list>
+		<ai type="BALANCED" clanHelpRange="1000" aggroRange="600">
+			<clan_list>
+				<clan>SPICULA_NEGATIVE</clan>
+			</clan_list>
+		</ai>
 		<collision>
 			<radius normal="12" />
 			<height normal="26" />
@@ -1771,7 +1785,7 @@
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="32229.993231701" magical="11022.423600014" critical="4" attackSpeed="253" range="40" />
+			<attack physical="32229.993231701" magical="11022.423600014" critical="4" attackSpeed="253" range="900" />
 			<defence physical="1739.1304347826" magical="1183.8140335773" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -1782,6 +1796,11 @@
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 		</skill_list>
+		<ai type="BALANCED" clanHelpRange="1000" aggroRange="600">
+			<clan_list>
+				<clan>SPICULA_NEGATIVE</clan>
+			</clan_list>
+		</ai>
 		<collision>
 			<radius normal="10" />
 			<height normal="24" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Kamael/NornilsCave.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Kamael/NornilsCave.xml
index f29e86007a..0d65fd61ad 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Kamael/NornilsCave.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Kamael/NornilsCave.xml
@@ -106,11 +106,6 @@
 			<npc id="23302" x="-85179" y="53508" z="-4592" heading="52286" respawnTime="60sec" /> <!-- Laido Golem of Repairs -->
 			<npc id="23302" x="-86604" y="52713" z="-4312" heading="49731" respawnTime="60sec" /> <!-- Laido Golem of Repairs -->
 			<npc id="23302" x="-86545" y="53459" z="-4312" heading="57798" respawnTime="60sec" /> <!-- Laido Golem of Repairs -->
-			<npc id="25937" x="-84084" y="59598" z="-2608" respawnTime="60sec" /> <!-- Spicula Negative -->
-			<npc id="25938" x="-83728" y="59885" z="-2608" respawnTime="60sec" /> <!-- Spicula Fighter Minion -->
-			<npc id="25938" x="-83893" y="59730" z="-2608" respawnTime="60sec" /> <!-- Spicula Fighter Minion -->
-			<npc id="25939" x="-83480" y="60186" z="-2600" respawnTime="60sec" /> <!-- Spicula Archer Minion -->
-			<npc id="25939" x="-83588" y="60083" z="-2600" respawnTime="60sec" /> <!-- Spicula Archer Minion -->
 			<npc id="33781" x="-83205" y="50976" z="-4728" respawnTime="60sec" /> <!-- Boz Core -->
 			<npc id="33790" x="-86832" y="42912" z="-2664" heading="8224" respawnTime="60sec" > <!-- Nornil Teleport Device -->
 				<parameters>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/RaidbossSpawns.xml
index e1b7d687d7..8c7e4e9cd8 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/RaidbossSpawns.xml
@@ -1937,4 +1937,7 @@
 	<spawn>
 		<npc id="25927" x="-18328" y="-114704" z="-4088" heading="8331" dbSave="true" dbName="Krogel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Krogel -->
 	</spawn>
+	<spawn>
+		<npc id="25937" x="-84084" y="59598" z="-2608" heading="0" dbSave="true" dbName="Spicula Negative" respawnTime="24Hour" respawnRandom="12hour" /> <!-- Spicula Negative -->
+	</spawn>	
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23700-23799.xml
index 60215aa7ef..7d9f576fe2 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/23700-23799.xml
@@ -345,9 +345,8 @@
 		</collision>
 	</npc>
 	<npc id="23719" level="85" type="L2Npc" name="Frozen Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>HUMAN</race>
-		<sex>FEMALE</sex>
+		<race>HUMANOID</race>
+		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="53771" hpRegen="7.5" mp="23928" mpRegen="2.7" />
 			<speed>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25900-25999.xml
index b76de8911f..149cfe0e8b 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/25900-25999.xml
@@ -1732,7 +1732,12 @@
 		</collision>
 	</npc>
 	<npc id="25937" level="95" type="L2RaidBoss" name="Spicula Negative" title="Raid Boss">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<parameters>
+			<minions name="Privates">
+				<npc id="25938" count="2" respawnTime="360" weightPoint="1" />
+				<npc id="25939" count="2" respawnTime="360" weightPoint="1" />
+			</minions>
+		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<acquire exp="4142475000" sp="994194" raidPoints="30" />
@@ -1748,7 +1753,6 @@
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
 			</attribute>
 		</stats>
-		<status attackable="false" />
 		<skill_list>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
@@ -1805,6 +1809,11 @@
 				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
 			</lucky_drop>
 		</drop_lists>
+		<ai type="BALANCED" clanHelpRange="1000" aggroRange="600">
+			<clan_list>
+				<clan>SPICULA_NEGATIVE</clan>
+			</clan_list>
+		</ai>
 		<collision>
 			<radius normal="20" />
 			<height normal="40" />
@@ -1831,6 +1840,11 @@
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 		</skill_list>
+		<ai type="BALANCED" clanHelpRange="1000" aggroRange="600">
+			<clan_list>
+				<clan>SPICULA_NEGATIVE</clan>
+			</clan_list>
+		</ai>
 		<collision>
 			<radius normal="12" />
 			<height normal="26" />
@@ -1846,7 +1860,7 @@
 				<walk ground="30" />
 				<run ground="180" />
 			</speed>
-			<attack physical="32229.993231701" magical="11022.423600014" critical="4" attackSpeed="253" range="40" />
+			<attack physical="32229.993231701" magical="11022.423600014" critical="4" attackSpeed="253" range="900" />
 			<defence physical="1739.1304347826" magical="1183.8140335773" />
 			<attribute>
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" />
@@ -1857,6 +1871,11 @@
 			<skill id="5465" level="1" /> <!-- Earth Attack -->
 			<skill id="4416" level="6" /> <!-- Humanoids -->
 		</skill_list>
+		<ai type="BALANCED" clanHelpRange="1000" aggroRange="600">
+			<clan_list>
+				<clan>SPICULA_NEGATIVE</clan>
+			</clan_list>
+		</ai>
 		<collision>
 			<radius normal="10" />
 			<height normal="24" />
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/26100-26199.xml
index ccf8fc61f5..b18edd466d 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/npcs/26100-26199.xml
@@ -2573,6 +2573,12 @@
 	</npc>
 	<npc id="26131" level="101" type="L2RaidBoss" name="Isabella" title="Raid Boss">
 		<!-- Source: www.l2wiki.com -->
+		<parameters>
+			<minions name="Privates">
+				<npc id="26132" count="2" respawnTime="360" weightPoint="1" />
+				<npc id="26133" count="2" respawnTime="360" weightPoint="1" />
+			</minions>
+		</parameters>
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<acquire exp="54225186393" sp="130140121" raidPoints="30" />