From d1e55ecc7aeedf4a0dd2633038beb80c499e1b12 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 25 Jul 2021 00:46:32 +0000
Subject: [PATCH] Spirit Forest 105 level. Thanks to nasseka.

---
 .../dist/game/data/html/default/34542.htm     |   1 +
 .../game/data/instances/SpiritForest105.xml   |  61 ++++++++
 .../instances/SpiritForest/SpiritForest.java  |  17 ++-
 .../dist/game/data/stats/npcs/24600-24699.xml | 144 ++++++++++++++++++
 .../game/data/stats/skills/34000-34099.xml    |   4 +
 5 files changed, 221 insertions(+), 6 deletions(-)
 create mode 100644 L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/SpiritForest105.xml

diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/html/default/34542.htm b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/html/default/34542.htm
index ef4c2514e9..af918731ff 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/html/default/34542.htm
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/html/default/34542.htm
@@ -8,4 +8,5 @@ Welcome! My name is Benusta. I help adventurers to travel to instance zones. I c
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest BaylorWarzone enterInstance110">Crystal Prison (Baylor) - Lv. 110</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest NightmareKamaloka enterInstance110">Nightmare Kamaloka - Lv. 110</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest AshenShadowRevolutionaries enterInstance110">Ashen Shadow Camp - Lv. 110</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest SpiritForest enterInstance105">Spirit Forest - Lv. 105</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/SpiritForest105.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/SpiritForest105.xml
new file mode 100644
index 0000000000..e2c9622031
--- /dev/null
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/instances/SpiritForest105.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- SpiritForest 105 -->
+<instance id="314" maxWorlds="100" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/instance.xsd">
+	<time duration="60" empty="0" />
+	<locations>
+		<enter type="FIXED">
+			<location x="-83306" y="244696" z="-14160" heading="0" /> <!-- Spirit Forest -->
+		</enter>
+		<exit type="ORIGIN" />
+	</locations>
+	<conditions>
+		<condition type="GroupMin">
+			<param name="limit" value="2" />
+		</condition>
+		<condition type="GroupMax">
+			<param name="limit" value="7" />
+		</condition>
+		<condition type="Level">
+			<param name="min" value="105" />
+		</condition>
+		<condition type="Distance" />
+		<condition type="Reenter" />
+	</conditions>
+	<reenter apply="ON_ENTER">
+		<reset day="MONDAY" hour="6" minute="30" />
+		<reset day="TUESDAY" hour="6" minute="30" />
+		<reset day="WEDNESDAY" hour="6" minute="30" />
+		<reset day="THURSDAY" hour="6" minute="30" />
+		<reset day="FRIDAY" hour="6" minute="30" />
+		<reset day="SATURDAY" hour="6" minute="30" />
+		<reset day="SUNDAY" hour="6" minute="30" />
+	</reenter>
+	<spawnlist>
+		<group name="spawns" spawnByDefault="true">
+			<npc id="24647" x="-81336" y="245944" z="-14157" heading="16530" respawnTime="20sec" />
+			<npc id="24645" x="-81912" y="245480" z="-14157" heading="4942" respawnTime="20sec" />
+			<npc id="24645" x="-81640" y="246168" z="-14157" heading="10603" respawnTime="20sec" />
+			<npc id="24645" x="-81848" y="246664" z="-14157" heading="18802" respawnTime="20sec" />
+			<npc id="24645" x="-82744" y="246344" z="-14153" heading="54507" respawnTime="20sec" />
+			<npc id="24645" x="-82856" y="245848" z="-14160" heading="46992" respawnTime="20sec" />
+			<npc id="24645" x="-82449" y="245293" z="-14160" heading="55619" respawnTime="20sec" />
+			<npc id="24646" x="-82312" y="245528" z="-14157" heading="18259" respawnTime="20sec" />
+			<npc id="24646" x="-81944" y="245864" z="-14156" heading="7064" respawnTime="20sec" />
+			<npc id="24646" x="-81960" y="246376" z="-14157" heading="21032" respawnTime="20sec" />
+			<npc id="24646" x="-82456" y="246568" z="-14154" heading="30288" respawnTime="20sec" />
+			<npc id="24648" x="-82216" y="246200" z="-14158" heading="50624" respawnTime="20sec" />
+			<npc id="24648" x="-83000" y="246056" z="-14156" heading="64254" respawnTime="20sec" />
+			<npc id="24647" x="-82328" y="245928" z="-14160" heading="57922" respawnTime="20sec" />
+			<npc id="24647" x="-82696" y="246072" z="-14149" heading="17355" respawnTime="20sec" />
+			<npc id="24647" x="-81784" y="245592" z="-14157" heading="62351" respawnTime="20sec" />
+			<npc id="24647" x="-81784" y="245704" z="-14157" heading="16979" respawnTime="20sec" />
+			<npc id="24648" x="-82712" y="245576" z="-14152" heading="36094" respawnTime="20sec" />
+			<npc id="24648" x="-81848" y="246232" z="-14157" heading="7048" respawnTime="20sec" />
+			<npc id="24648" x="-82168" y="245272" z="-14160" heading="45511" respawnTime="20sec" />
+			<npc id="24647" x="-82712" y="246552" z="-14153" heading="27043" respawnTime="20sec" />
+			<npc id="24646" x="-82968" y="246264" z="-14151" heading="41494" respawnTime="20sec" />
+			<npc id="24646" x="-82696" y="245384" z="-14153" heading="59660" respawnTime="20sec" />
+			<npc id="24648" x="-82136" y="245448" z="-14158" heading="1108" respawnTime="20sec" />
+		</group>
+	</spawnlist>
+</instance>
\ No newline at end of file
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
index 2752e96a47..f5d1398982 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/scripts/instances/SpiritForest/SpiritForest.java
@@ -34,19 +34,24 @@ import instances.AbstractInstance;
  */
 public class SpiritForest extends AbstractInstance
 {
-	private static final int TEMPLATE = 310; // Spirit Forest
+	private static final int[] TEMPLATE_IDS =
+	{
+		310,
+		314
+	};
 	
 	public SpiritForest()
 	{
-		super(TEMPLATE);
-		addInstanceLeaveId(TEMPLATE);
+		super(TEMPLATE_IDS);
+		addInstanceLeaveId(TEMPLATE_IDS);
 	}
 	
 	@Override
 	public String onAdvEvent(String event, Npc npc, PlayerInstance player)
 	{
-		if (event.equals("enterInstance"))
+		if (event.contains("enterInstance"))
 		{
+			final int templateId = event.contains("105") ? TEMPLATE_IDS[1] : TEMPLATE_IDS[0];
 			if (player.isInParty())
 			{
 				final Party party = player.getParty();
@@ -74,12 +79,12 @@ public class SpiritForest extends AbstractInstance
 				
 				for (PlayerInstance member : members)
 				{
-					enterInstance(member, npc, TEMPLATE);
+					enterInstance(member, npc, templateId);
 				}
 			}
 			else if (player.isGM())
 			{
-				enterInstance(player, npc, TEMPLATE);
+				enterInstance(player, npc, templateId);
 			}
 			else
 			{
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/npcs/24600-24699.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/npcs/24600-24699.xml
index c10a1f4a00..9dd0d882d9 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/npcs/24600-24699.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/npcs/24600-24699.xml
@@ -2049,4 +2049,148 @@
 			</spoil>
 		</dropLists>
 	</npc>
+	<npc id="24645" level="112" type="Monster" name="Lirein of the Breeze">
+		<race>ELEMENTAL</race>
+		<sex>FEMALE</sex>
+		<acquire exp="8399456352" sp="457217" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="612929" hpRegen="8.5" mp="2862" mpRegen="3" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<attack type="wind" value="330" />
+				<defence fire="250" water="250" wind="250" earth="200" holy="250" dark="250" />
+			</attribute>
+			<speed>
+				<walk ground="39" />
+				<run ground="70" />
+			</speed>
+		</stats>
+		<skillList>
+			<skill id="4416" level="7" /> <!-- Spirits -->
+			<skill id="5464" level="1" /> <!-- Wind Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34029" level="1" /> <!-- Spirit Energy -->
+			<skill id="14818" level="1" /> <!-- Instant kill resistance -->
+			<skill id="16547" level="1" /> <!-- Danger zone resistans -->
+		</skillList>
+		<collision>
+			<radius normal="11" />
+			<height normal="35" />
+		</collision>
+		<dropLists>
+			<drop>
+				<item id="57" min="50000" max="65000" chance="70" /> <!-- Adena -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24646" level="112" type="Monster" name="Undine of the Waves">
+		<race>ELEMENTAL</race>
+		<sex>FEMALE</sex>
+		<acquire exp="8399456352" sp="457217" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="612929" hpRegen="8.5" mp="2862" mpRegen="3" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<attack type="wind" value="330" />
+				<defence fire="250" water="250" wind="250" earth="200" holy="250" dark="250" />
+			</attribute>
+			<speed>
+				<walk ground="39" />
+				<run ground="70" />
+			</speed>
+		</stats>
+		<skillList>
+			<skill id="4416" level="7" /> <!-- Spirits -->
+			<skill id="5464" level="1" /> <!-- Wind Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34029" level="1" /> <!-- Spirit Energy -->
+			<skill id="14818" level="1" /> <!-- Instant kill resistance -->
+			<skill id="16547" level="1" /> <!-- Danger zone resistans -->
+		</skillList>
+		<collision>
+			<radius normal="12" />
+			<height normal="27" />
+		</collision>
+		<dropLists>
+			<drop>
+				<item id="57" min="50000" max="65000" chance="70" /> <!-- Adena -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24647" level="112" type="Monster" name="Dryad of the Woods">
+		<race>ELEMENTAL</race>
+		<sex>FEMALE</sex>
+		<acquire exp="8399456352" sp="457217" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="612929" hpRegen="8.5" mp="2862" mpRegen="3" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<attack type="wind" value="330" />
+				<defence fire="250" water="250" wind="250" earth="200" holy="250" dark="250" />
+			</attribute>
+			<speed>
+				<walk ground="39" />
+				<run ground="70" />
+			</speed>
+		</stats>
+		<skillList>
+			<skill id="4416" level="13" /> <!-- Fairy -->
+			<skill id="5464" level="1" /> <!-- Wind Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34029" level="1" /> <!-- Spirit Energy -->
+			<skill id="14818" level="1" /> <!-- Instant kill resistance -->
+			<skill id="16547" level="1" /> <!-- Danger zone resistans -->
+		</skillList>
+		<collision>
+			<radius normal="9" />
+			<height normal="20" />
+		</collision>
+		<dropLists>
+			<drop>
+				<item id="57" min="50000" max="65000" chance="70" /> <!-- Adena -->
+			</drop>
+		</dropLists>
+	</npc>
+	<npc id="24648" level="112" type="Monster" name="Flame Salamander">
+		<race>ELEMENTAL</race>
+		<sex>FEMALE</sex>
+		<acquire exp="8399456352" sp="457217" />
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="612929" hpRegen="8.5" mp="2862" mpRegen="3" />
+			<attack physical="617815.429469286" magical="1368.16567732246" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
+			<defence physical="5043.54066985646" magical="1934.40396671246" />
+			<attribute>
+				<attack type="wind" value="330" />
+				<defence fire="250" water="250" wind="250" earth="200" holy="250" dark="250" />
+			</attribute>
+			<speed>
+				<walk ground="39" />
+				<run ground="70" />
+			</speed>
+		</stats>
+		<skillList>
+			<skill id="4416" level="7" /> <!-- Spirits -->
+			<skill id="5464" level="1" /> <!-- Wind Attack -->
+			<skill id="14765" level="3" /> <!-- Vampiric Rage Resistance -->
+			<skill id="33104" level="1" /> <!-- Party Bonus -->
+			<skill id="34029" level="1" /> <!-- Spirit Energy -->
+			<skill id="14818" level="1" /> <!-- Instant kill resistance -->
+			<skill id="16547" level="1" /> <!-- Danger zone resistans -->
+		</skillList>
+		<collision>
+			<radius normal="20" />
+			<height normal="25" />
+		</collision>
+		<dropLists>
+			<drop>
+				<item id="57" min="50000" max="65000" chance="70" /> <!-- Adena -->
+			</drop>
+		</dropLists>
+	</npc>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/34000-34099.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/34000-34099.xml
index 3cc72e09b3..baf5cd28c4 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/34000-34099.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/stats/skills/34000-34099.xml
@@ -114,4 +114,8 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
+	<skill id="34029" toLevel="2" name="Spirit Energy">
+		<icon>icon.skill0000</icon>
+		<operateType>P</operateType>
+	</skill>
 </list>