From 8650b7d095a27d16577555c4a298de4cd72f36fe Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 10 Dec 2021 02:05:02 +0000
Subject: [PATCH] Limit for Expand Glorious Warrior's Magic Lamp (45483) skill.

---
 .../gameserver/data/xml/MagicLampData.java    |  2 +-
 .../gameserver/model/actor/Player.java        | 17 +++++---
 .../magiclamp/ExMagicLampGameInfoUI.java      | 21 ++--------
 .../magiclamp/ExMagicLampGameResult.java      |  4 +-
 .../data/skillTrees/3rdClass/Adventurer.xml   |  2 +
 .../data/skillTrees/3rdClass/ArcanaLord.xml   |  2 +
 .../data/skillTrees/3rdClass/Archmage.xml     |  2 +
 .../data/skillTrees/3rdClass/Cardinal.xml     |  2 +
 .../data/skillTrees/3rdClass/Dominator.xml    |  2 +
 .../data/skillTrees/3rdClass/DoomBringer.xml  |  2 +
 .../data/skillTrees/3rdClass/Doomcryer.xml    |  2 +
 .../data/skillTrees/3rdClass/Dreadnought.xml  |  2 +
 .../game/data/skillTrees/3rdClass/Duelist.xml |  2 +
 .../skillTrees/3rdClass/ElementalMaster.xml   |  2 +
 .../data/skillTrees/3rdClass/EvaSaint.xml     |  2 +
 .../data/skillTrees/3rdClass/EvaTemplar.xml   |  2 +
 .../skillTrees/3rdClass/FortuneSeeker.xml     |  2 +
 .../data/skillTrees/3rdClass/GhostHunter.xml  |  2 +
 .../skillTrees/3rdClass/GhostSentinel.xml     |  2 +
 .../skillTrees/3rdClass/GrandKhavatari.xml    |  2 +
 .../data/skillTrees/3rdClass/HellKnight.xml   |  2 +
 .../data/skillTrees/3rdClass/Hierophant.xml   |  2 +
 .../game/data/skillTrees/3rdClass/Maestro.xml |  2 +
 .../skillTrees/3rdClass/MoonlightSentinel.xml |  2 +
 .../data/skillTrees/3rdClass/MysticMuse.xml   |  2 +
 .../skillTrees/3rdClass/PhoenixKnight.xml     |  2 +
 .../data/skillTrees/3rdClass/Sagittarius.xml  |  2 +
 .../skillTrees/3rdClass/ShillienSaint.xml     |  2 +
 .../skillTrees/3rdClass/ShillienTemplar.xml   |  2 +
 .../data/skillTrees/3rdClass/SoulHound.xml    |  2 +
 .../data/skillTrees/3rdClass/Soultaker.xml    |  2 +
 .../skillTrees/3rdClass/SpectralDancer.xml    |  2 +
 .../skillTrees/3rdClass/SpectralMaster.xml    |  2 +
 .../skillTrees/3rdClass/StormScreamer.xml     |  2 +
 .../data/skillTrees/3rdClass/Swordmuse.xml    |  2 +
 .../game/data/skillTrees/3rdClass/Titan.xml   |  2 +
 .../data/skillTrees/3rdClass/Trickster.xml    |  2 +
 .../data/skillTrees/3rdClass/WindRider.xml    |  2 +
 .../DeathKnight/DeathKnightDarkElf.xml        |  2 +
 .../skillTrees/DeathKnight/DeathKnightElf.xml |  2 +
 .../DeathKnight/DeathKnightHuman.xml          | 41 +++++++++++++++++--
 .../data/skillTrees/Sylph/StormBlaster.xml    |  2 +
 .../game/data/stats/skills/45400-45499.xml    | 14 -------
 .../gameserver/data/xml/MagicLampData.java    |  2 +-
 .../gameserver/model/actor/Player.java        | 17 +++++---
 .../magiclamp/ExMagicLampGameInfoUI.java      | 21 ++--------
 .../magiclamp/ExMagicLampGameResult.java      |  4 +-
 .../data/skillTrees/3rdClass/Adventurer.xml   |  2 +
 .../data/skillTrees/3rdClass/ArcanaLord.xml   |  2 +
 .../data/skillTrees/3rdClass/Archmage.xml     |  2 +
 .../data/skillTrees/3rdClass/Cardinal.xml     |  2 +
 .../data/skillTrees/3rdClass/Dominator.xml    |  2 +
 .../data/skillTrees/3rdClass/DoomBringer.xml  |  2 +
 .../data/skillTrees/3rdClass/Doomcryer.xml    |  2 +
 .../data/skillTrees/3rdClass/Dreadnought.xml  |  2 +
 .../game/data/skillTrees/3rdClass/Duelist.xml |  2 +
 .../skillTrees/3rdClass/ElementalMaster.xml   |  2 +
 .../data/skillTrees/3rdClass/EvaSaint.xml     |  2 +
 .../data/skillTrees/3rdClass/EvaTemplar.xml   |  2 +
 .../skillTrees/3rdClass/FortuneSeeker.xml     |  2 +
 .../data/skillTrees/3rdClass/GhostHunter.xml  |  2 +
 .../skillTrees/3rdClass/GhostSentinel.xml     |  2 +
 .../skillTrees/3rdClass/GrandKhavatari.xml    |  2 +
 .../data/skillTrees/3rdClass/HellKnight.xml   |  2 +
 .../data/skillTrees/3rdClass/Hierophant.xml   |  2 +
 .../game/data/skillTrees/3rdClass/Maestro.xml |  2 +
 .../skillTrees/3rdClass/MoonlightSentinel.xml |  2 +
 .../data/skillTrees/3rdClass/MysticMuse.xml   |  2 +
 .../skillTrees/3rdClass/PhoenixKnight.xml     |  2 +
 .../data/skillTrees/3rdClass/Sagittarius.xml  |  2 +
 .../skillTrees/3rdClass/ShillienSaint.xml     |  2 +
 .../skillTrees/3rdClass/ShillienTemplar.xml   |  2 +
 .../data/skillTrees/3rdClass/SoulHound.xml    |  2 +
 .../data/skillTrees/3rdClass/Soultaker.xml    |  2 +
 .../skillTrees/3rdClass/SpectralDancer.xml    |  2 +
 .../skillTrees/3rdClass/SpectralMaster.xml    |  2 +
 .../skillTrees/3rdClass/StormScreamer.xml     |  2 +
 .../data/skillTrees/3rdClass/Swordmuse.xml    |  2 +
 .../game/data/skillTrees/3rdClass/Titan.xml   |  2 +
 .../data/skillTrees/3rdClass/Trickster.xml    |  2 +
 .../data/skillTrees/3rdClass/WindRider.xml    |  2 +
 .../DeathKnight/DeathKnightDarkElf.xml        |  2 +
 .../skillTrees/DeathKnight/DeathKnightElf.xml |  2 +
 .../DeathKnight/DeathKnightHuman.xml          | 41 +++++++++++++++++--
 .../data/skillTrees/Sylph/StormBlaster.xml    |  2 +
 .../game/data/stats/skills/45400-45499.xml    | 14 -------
 .../gameserver/data/xml/MagicLampData.java    |  2 +-
 .../gameserver/model/actor/Player.java        | 17 +++++---
 .../magiclamp/ExMagicLampGameInfoUI.java      | 21 ++--------
 .../magiclamp/ExMagicLampGameResult.java      |  4 +-
 90 files changed, 278 insertions(+), 112 deletions(-)

diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
index 4e50d8cf2b..5bf77239fb 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
@@ -71,7 +71,7 @@ public class MagicLampData implements IXmlReader
 	
 	public void addLampExp(Player player, double exp, boolean rateModifiers)
 	{
-		if (Config.ENABLE_MAGIC_LAMP)
+		if (Config.ENABLE_MAGIC_LAMP && (player.getLampCount() < player.getMaxLampCount()))
 		{
 			final int lampExp = (int) (exp * (rateModifiers ? Config.MAGIC_LAMP_CHARGE_RATE * player.getStat().getMul(Stat.MAGIC_LAMP_EXP_RATE, 1) : 1));
 			int calc = lampExp + player.getLampExp();
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
index 1319f48a7e..46a3777a85 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -1250,19 +1250,24 @@ public class Player extends Playable
 		return getVariables().getInt(PlayerVariables.MAGIC_LAMP_EXP, 0);
 	}
 	
-	public int getLampCount()
-	{
-		return getVariables().getInt(PlayerVariables.MAGIC_LAMP_COUNT, 0);
-	}
-	
 	public void setLampExp(int exp)
 	{
 		getVariables().set(PlayerVariables.MAGIC_LAMP_EXP, exp);
 	}
 	
+	public int getLampCount()
+	{
+		return Math.min(getVariables().getInt(PlayerVariables.MAGIC_LAMP_COUNT, 0), getMaxLampCount());
+	}
+	
 	public void setLampCount(int count)
 	{
-		getVariables().set(PlayerVariables.MAGIC_LAMP_COUNT, count);
+		getVariables().set(PlayerVariables.MAGIC_LAMP_COUNT, Math.min(count, getMaxLampCount()));
+	}
+	
+	public int getMaxLampCount()
+	{
+		return Config.MAGIC_LAMP_MAX_GAME_COUNT;
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
index 5183d2f677..c7ff7789d9 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
@@ -21,7 +21,6 @@ import java.util.List;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.data.xml.MagicLampData;
-import org.l2jmobius.gameserver.enums.LampMode;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.GreaterMagicLampHolder;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -47,31 +46,19 @@ public class ExMagicLampGameInfoUI implements IClientOutgoingPacket
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.EX_MAGICLAMP_GAME_INFO.writeId(packet);
-		packet.writeD(Config.MAGIC_LAMP_MAX_GAME_COUNT); // nMagicLampGameMaxCCount
+		packet.writeD(_player.getMaxLampCount()); // nMagicLampGameMaxCCount
 		packet.writeD(_count); // cMagicLampGameCCount
-		switch (LampMode.getByMode(_mode))
-		{
-			case NORMAL:
-			{
-				packet.writeD(Config.MAGIC_LAMP_REWARD_COUNT);// cMagicLampCountPerGame
-				break;
-			}
-			case GREATER:
-			{
-				packet.writeD(Config.MAGIC_LAMP_GREATER_REWARD_COUNT); // cMagicLampCountPerGame
-				break;
-			}
-		}
+		packet.writeD(_mode == 0 ? Config.MAGIC_LAMP_REWARD_COUNT : Config.MAGIC_LAMP_GREATER_REWARD_COUNT); // cMagicLampCountPerGame
 		packet.writeD(_player.getLampCount()); // cMagicLampCount
 		packet.writeC(_mode); // cGameMode
 		final List<GreaterMagicLampHolder> greater = MagicLampData.getInstance().getGreaterLamps();
 		packet.writeD(greater.size()); // costItemList
-		greater.forEach(lamp ->
+		for (GreaterMagicLampHolder lamp : greater)
 		{
 			packet.writeD(lamp.getItemId()); // nItemClassID
 			packet.writeQ(lamp.getCount()); // nItemAmountPerGame
 			packet.writeQ(_player.getInventory().getInventoryItemCount(lamp.getItemId(), -1)); // nItemAmount
-		});
+		}
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
index a076f7ed40..d44ded9d1a 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
@@ -112,13 +112,13 @@ public class ExMagicLampGameResult implements IClientOutgoingPacket
 	{
 		OutgoingPackets.EX_MAGICLAMP_GAME_RESULT.writeId(packet);
 		packet.writeD(_reward.size()); // magicLampGameResult
-		_reward.values().forEach(lamp ->
+		for (MagicLampHolder lamp : _reward.values())
 		{
 			packet.writeC(lamp.getType().getGrade()); // cGradeNum
 			packet.writeD(lamp.getCount()); // nRewardCount
 			packet.writeQ(lamp.getExp()); // nEXP
 			packet.writeQ(lamp.getSp()); // nSP
-		});
+		}
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Adventurer.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Adventurer.xml
index 1c58038df8..2b64452204 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Adventurer.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Adventurer.xml
@@ -265,5 +265,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ArcanaLord.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ArcanaLord.xml
index 24924e65ae..1a26a4e765 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ArcanaLord.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ArcanaLord.xml
@@ -278,5 +278,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Archmage.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Archmage.xml
index 2f56d8698e..3a882056b0 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Archmage.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Archmage.xml
@@ -292,5 +292,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Cardinal.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Cardinal.xml
index 21dc2bd30b..c739714691 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Cardinal.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Cardinal.xml
@@ -332,5 +332,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Dominator.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Dominator.xml
index b8ca68029f..89935ba987 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Dominator.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Dominator.xml
@@ -321,5 +321,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/DoomBringer.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/DoomBringer.xml
index d81a18714a..f7b860dc16 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/DoomBringer.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/DoomBringer.xml
@@ -179,5 +179,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Doomcryer.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Doomcryer.xml
index 8fced885b0..5fd7316bc6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Doomcryer.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Doomcryer.xml
@@ -257,5 +257,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Dreadnought.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Dreadnought.xml
index c10b206446..2ec952c9f4 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Dreadnought.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Dreadnought.xml
@@ -351,5 +351,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Duelist.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Duelist.xml
index 3b0884d244..66d8e8b5c9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Duelist.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Duelist.xml
@@ -317,5 +317,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ElementalMaster.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ElementalMaster.xml
index 4775510bb2..8f46c992f5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ElementalMaster.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ElementalMaster.xml
@@ -281,5 +281,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/EvaSaint.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/EvaSaint.xml
index 5b2267829e..61f44ff47b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/EvaSaint.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/EvaSaint.xml
@@ -286,5 +286,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/EvaTemplar.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/EvaTemplar.xml
index be0686f2b0..268be58e4e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/EvaTemplar.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/EvaTemplar.xml
@@ -422,5 +422,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/FortuneSeeker.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/FortuneSeeker.xml
index 6a92f10f3b..e694f1ddcb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/FortuneSeeker.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/FortuneSeeker.xml
@@ -278,5 +278,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GhostHunter.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GhostHunter.xml
index 8607b51899..d610d8fcbe 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GhostHunter.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GhostHunter.xml
@@ -390,5 +390,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GhostSentinel.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GhostSentinel.xml
index 2ca3312d3f..fe28f2a159 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GhostSentinel.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GhostSentinel.xml
@@ -343,5 +343,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
index 0704e4da6e..513e0198b9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
@@ -283,5 +283,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/HellKnight.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/HellKnight.xml
index 7ceb9128a3..161ff287ec 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/HellKnight.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/HellKnight.xml
@@ -298,5 +298,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Hierophant.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Hierophant.xml
index d27b1ade33..a729303ffd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Hierophant.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Hierophant.xml
@@ -308,5 +308,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Maestro.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Maestro.xml
index 9cfe25f3b1..214b0c816e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Maestro.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Maestro.xml
@@ -258,5 +258,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/MoonlightSentinel.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/MoonlightSentinel.xml
index d346e089b3..10137568ad 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/MoonlightSentinel.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/MoonlightSentinel.xml
@@ -269,5 +269,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/MysticMuse.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/MysticMuse.xml
index 815286d2cf..bb93343070 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/MysticMuse.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/MysticMuse.xml
@@ -313,5 +313,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/PhoenixKnight.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/PhoenixKnight.xml
index 8aa409a2b4..933b03c00b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/PhoenixKnight.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/PhoenixKnight.xml
@@ -402,5 +402,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Sagittarius.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Sagittarius.xml
index 3092839227..786742f08d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Sagittarius.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Sagittarius.xml
@@ -226,5 +226,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ShillienSaint.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ShillienSaint.xml
index 52594e38a2..94d7e1559d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ShillienSaint.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ShillienSaint.xml
@@ -335,5 +335,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ShillienTemplar.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ShillienTemplar.xml
index 90f9aca0fc..c6ca4ef76d 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ShillienTemplar.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/ShillienTemplar.xml
@@ -410,5 +410,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SoulHound.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SoulHound.xml
index f8caa38d1a..b2dc2aa867 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SoulHound.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SoulHound.xml
@@ -251,5 +251,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Soultaker.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Soultaker.xml
index 553a519c83..6bf4086788 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Soultaker.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Soultaker.xml
@@ -314,5 +314,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SpectralDancer.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SpectralDancer.xml
index 8e68c975cc..e06d970f97 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SpectralDancer.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SpectralDancer.xml
@@ -353,5 +353,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SpectralMaster.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SpectralMaster.xml
index b154b8ef1e..3dd39f66ad 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SpectralMaster.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/SpectralMaster.xml
@@ -279,5 +279,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/StormScreamer.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/StormScreamer.xml
index 09191e60e2..cf2047daa3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/StormScreamer.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/StormScreamer.xml
@@ -303,5 +303,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Swordmuse.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Swordmuse.xml
index 8c4192df4b..49ca4b586b 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Swordmuse.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Swordmuse.xml
@@ -278,5 +278,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Titan.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Titan.xml
index bbe0776a1d..4ce75b77bf 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Titan.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Titan.xml
@@ -324,5 +324,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Trickster.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Trickster.xml
index 39c7311309..79c9a36a9e 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Trickster.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/Trickster.xml
@@ -207,5 +207,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/WindRider.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/WindRider.xml
index 8de678f572..77f1ad0d54 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/WindRider.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/3rdClass/WindRider.xml
@@ -314,5 +314,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightDarkElf.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightDarkElf.xml
index 00dbda32ae..f27a234786 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightDarkElf.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightDarkElf.xml
@@ -334,5 +334,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightElf.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightElf.xml
index 7aef4e30db..3b5196a27a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightElf.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightElf.xml
@@ -296,5 +296,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightHuman.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightHuman.xml
index 675d6d17a6..34fcc4e0fc 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightHuman.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/DeathKnight/DeathKnightHuman.xml
@@ -43,9 +43,6 @@
 		<skill skillName="Divine Inspiration" skillId="1405" skillLevel="4" getLevel="76" levelUpSp="8000000">
 			<item id="8621" count="1" /> <!-- Buff Expansion Book Lv. 4 -->
 		</skill>
-		<skill skillName="Mount Night Mare" skillId="54207" skillLevel="1" getLevel="76">
-			<item id="93383" count="1" /> <!-- Spellbook - Mount Nightmare Steed -->
-		</skill>
 		<skill skillName="Emergency Rescue" skillId="70" skillLevel="46" getLevel="76" levelUpSp="8000000" />
 		<skill skillName="Evolution Defense" skillId="45188" skillLevel="1" getLevel="76">
 			<item id="57" count="5000000" /> <!-- Adena -->
@@ -72,6 +69,9 @@
 		<skill skillName="Ultimate Death Knight Transformation" skillId="54206" skillLevel="1" getLevel="76" levelUpSp="8000000">
 			<item id="93387" count="1" /> <!-- Spellbook - Ultimate Death Knight Form -->
 		</skill>
+		<skill skillName="Mount Night Mare" skillId="54207" skillLevel="1" getLevel="76">
+			<item id="93383" count="1" /> <!-- Spellbook - Mount Nightmare Steed -->
+		</skill>
 
 		<skill skillName="Emergency Rescue" skillId="70" skillLevel="47" getLevel="77" levelUpSp="10000000" />
 		<skill skillName="Hellfire" skillId="45312" skillLevel="2" getLevel="77" levelUpSp="10000000" />
@@ -213,5 +213,40 @@
 		<skill skillName="Death Sword Mastery" skillId="45353" skillLevel="35" getLevel="90" levelUpSp="840000000" />
 		<skill skillName="Death Armor Mastery" skillId="45354" skillLevel="35" getLevel="90" levelUpSp="840000000" />
 		<skill skillName="Blessed by Sayha" skillId="45408" skillLevel="4" getLevel="90" levelUpSp="0" />
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="1" getLevel="88" autoGet="true" />
+		<skill skillName="Glorious Warrior's Special Teleport" skillId="45472" skillLevel="1" getLevel="88" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="1" getLevel="88" autoGet="true" />
+		
+		<skill skillName="Expand Glorious Warrior's Special Teleports" skillId="45473" skillLevel="1" getLevel="89" autoGet="true" />
+		
+		<skill skillName="Glorious Warrior's Unique Title Color" skillId="45474" skillLevel="1" getLevel="90" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Hair Accessory Slots" skillId="45475" skillLevel="1" getLevel="90" autoGet="true" />
+		<skill skillName="Glorious Warrior's Ability" skillId="45361" skillLevel="1" getLevel="90">
+			<item id="94046" count="1" /> <!-- Spellbook: Glorious Warrior's Ability Lv. 1 -->
+		</skill>
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="2" getLevel="91" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="2" getLevel="91" autoGet="true" />
+		<skill skillName="Glorious Warrior's Ability" skillId="45361" skillLevel="2" getLevel="91">
+			<item id="95890" count="1" /> <!-- Spellbook: Glorious Warrior's Ability Lv. 2 -->
+		</skill>
+		<skill skillName="Glorious Warrior's Resurrection Cost Decrease" skillId="47240" skillLevel="1" getLevel="91" autoGet="true" />
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="3" getLevel="92" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="3" getLevel="92" autoGet="true" />
+		<skill skillName="Glorious Warrior's Ability" skillId="45361" skillLevel="3" getLevel="92">
+			<item id="95891" count="1" /> <!-- Spellbook: Glorious Warrior's Ability Lv. 3 -->
+		</skill>
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="4" getLevel="93" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="4" getLevel="93" autoGet="true" />
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="5" getLevel="94" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="5" getLevel="94" autoGet="true" />
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/Sylph/StormBlaster.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/Sylph/StormBlaster.xml
index e3d44596e9..dd6ddd4295 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/Sylph/StormBlaster.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/skillTrees/Sylph/StormBlaster.xml
@@ -187,5 +187,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml
index 609aea19fb..23f1f007d9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/skills/45400-45499.xml
@@ -2116,20 +2116,6 @@
 		<!-- Magic Lamp limit $s1 -->
 		<icon>icon.skill0000</icon>
 		<operateType>P</operateType>
-		<effects>
-			<effect name="ModifyMagicLampPoints">
-				<amount>
-					<value level="1">100</value>
-					<value level="2">200</value>
-					<value level="3">300</value>
-					<value level="4">400</value>
-					<value level="5">500</value>
-					<value level="6">600</value>
-					<value level="7">700</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-		</effects>
 	</skill>
 	<skill id="45484" toLevel="45" name="Power Break">
 		<!-- <Shock skill> Attacks the enemy with $s1 power. Stuns for $s2 Ignores Shield Defense. -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
index 4e50d8cf2b..5bf77239fb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
@@ -71,7 +71,7 @@ public class MagicLampData implements IXmlReader
 	
 	public void addLampExp(Player player, double exp, boolean rateModifiers)
 	{
-		if (Config.ENABLE_MAGIC_LAMP)
+		if (Config.ENABLE_MAGIC_LAMP && (player.getLampCount() < player.getMaxLampCount()))
 		{
 			final int lampExp = (int) (exp * (rateModifiers ? Config.MAGIC_LAMP_CHARGE_RATE * player.getStat().getMul(Stat.MAGIC_LAMP_EXP_RATE, 1) : 1));
 			int calc = lampExp + player.getLampExp();
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
index ba6c2c8496..e72633bff5 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -1281,19 +1281,24 @@ public class Player extends Playable
 		return getVariables().getInt(PlayerVariables.MAGIC_LAMP_EXP, 0);
 	}
 	
-	public int getLampCount()
-	{
-		return getVariables().getInt(PlayerVariables.MAGIC_LAMP_COUNT, 0);
-	}
-	
 	public void setLampExp(int exp)
 	{
 		getVariables().set(PlayerVariables.MAGIC_LAMP_EXP, exp);
 	}
 	
+	public int getLampCount()
+	{
+		return Math.min(getVariables().getInt(PlayerVariables.MAGIC_LAMP_COUNT, 0), getMaxLampCount());
+	}
+	
 	public void setLampCount(int count)
 	{
-		getVariables().set(PlayerVariables.MAGIC_LAMP_COUNT, count);
+		getVariables().set(PlayerVariables.MAGIC_LAMP_COUNT, Math.min(count, getMaxLampCount()));
+	}
+	
+	public int getMaxLampCount()
+	{
+		return Config.MAGIC_LAMP_MAX_GAME_COUNT + (getSkillLevel(45483) * 100); // Expand Glorious Warrior's Magic Lamp (45483).
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
index 5183d2f677..c7ff7789d9 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
@@ -21,7 +21,6 @@ import java.util.List;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.data.xml.MagicLampData;
-import org.l2jmobius.gameserver.enums.LampMode;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.GreaterMagicLampHolder;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -47,31 +46,19 @@ public class ExMagicLampGameInfoUI implements IClientOutgoingPacket
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.EX_MAGICLAMP_GAME_INFO.writeId(packet);
-		packet.writeD(Config.MAGIC_LAMP_MAX_GAME_COUNT); // nMagicLampGameMaxCCount
+		packet.writeD(_player.getMaxLampCount()); // nMagicLampGameMaxCCount
 		packet.writeD(_count); // cMagicLampGameCCount
-		switch (LampMode.getByMode(_mode))
-		{
-			case NORMAL:
-			{
-				packet.writeD(Config.MAGIC_LAMP_REWARD_COUNT);// cMagicLampCountPerGame
-				break;
-			}
-			case GREATER:
-			{
-				packet.writeD(Config.MAGIC_LAMP_GREATER_REWARD_COUNT); // cMagicLampCountPerGame
-				break;
-			}
-		}
+		packet.writeD(_mode == 0 ? Config.MAGIC_LAMP_REWARD_COUNT : Config.MAGIC_LAMP_GREATER_REWARD_COUNT); // cMagicLampCountPerGame
 		packet.writeD(_player.getLampCount()); // cMagicLampCount
 		packet.writeC(_mode); // cGameMode
 		final List<GreaterMagicLampHolder> greater = MagicLampData.getInstance().getGreaterLamps();
 		packet.writeD(greater.size()); // costItemList
-		greater.forEach(lamp ->
+		for (GreaterMagicLampHolder lamp : greater)
 		{
 			packet.writeD(lamp.getItemId()); // nItemClassID
 			packet.writeQ(lamp.getCount()); // nItemAmountPerGame
 			packet.writeQ(_player.getInventory().getInventoryItemCount(lamp.getItemId(), -1)); // nItemAmount
-		});
+		}
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
index a076f7ed40..d44ded9d1a 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
+++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
@@ -112,13 +112,13 @@ public class ExMagicLampGameResult implements IClientOutgoingPacket
 	{
 		OutgoingPackets.EX_MAGICLAMP_GAME_RESULT.writeId(packet);
 		packet.writeD(_reward.size()); // magicLampGameResult
-		_reward.values().forEach(lamp ->
+		for (MagicLampHolder lamp : _reward.values())
 		{
 			packet.writeC(lamp.getType().getGrade()); // cGradeNum
 			packet.writeD(lamp.getCount()); // nRewardCount
 			packet.writeQ(lamp.getExp()); // nEXP
 			packet.writeQ(lamp.getSp()); // nSP
-		});
+		}
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Adventurer.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Adventurer.xml
index 1c58038df8..2b64452204 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Adventurer.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Adventurer.xml
@@ -265,5 +265,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ArcanaLord.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ArcanaLord.xml
index 24924e65ae..1a26a4e765 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ArcanaLord.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ArcanaLord.xml
@@ -278,5 +278,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Archmage.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Archmage.xml
index 2f56d8698e..3a882056b0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Archmage.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Archmage.xml
@@ -292,5 +292,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Cardinal.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Cardinal.xml
index 21dc2bd30b..c739714691 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Cardinal.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Cardinal.xml
@@ -332,5 +332,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Dominator.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Dominator.xml
index b8ca68029f..89935ba987 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Dominator.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Dominator.xml
@@ -321,5 +321,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/DoomBringer.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/DoomBringer.xml
index d81a18714a..f7b860dc16 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/DoomBringer.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/DoomBringer.xml
@@ -179,5 +179,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Doomcryer.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Doomcryer.xml
index 8fced885b0..5fd7316bc6 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Doomcryer.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Doomcryer.xml
@@ -257,5 +257,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Dreadnought.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Dreadnought.xml
index c10b206446..2ec952c9f4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Dreadnought.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Dreadnought.xml
@@ -351,5 +351,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Duelist.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Duelist.xml
index 3b0884d244..66d8e8b5c9 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Duelist.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Duelist.xml
@@ -317,5 +317,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ElementalMaster.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ElementalMaster.xml
index 4775510bb2..8f46c992f5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ElementalMaster.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ElementalMaster.xml
@@ -281,5 +281,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/EvaSaint.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/EvaSaint.xml
index 5b2267829e..61f44ff47b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/EvaSaint.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/EvaSaint.xml
@@ -286,5 +286,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/EvaTemplar.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/EvaTemplar.xml
index be0686f2b0..268be58e4e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/EvaTemplar.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/EvaTemplar.xml
@@ -422,5 +422,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/FortuneSeeker.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/FortuneSeeker.xml
index 6a92f10f3b..e694f1ddcb 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/FortuneSeeker.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/FortuneSeeker.xml
@@ -278,5 +278,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GhostHunter.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GhostHunter.xml
index 8607b51899..d610d8fcbe 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GhostHunter.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GhostHunter.xml
@@ -390,5 +390,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GhostSentinel.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GhostSentinel.xml
index 2ca3312d3f..fe28f2a159 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GhostSentinel.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GhostSentinel.xml
@@ -343,5 +343,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
index 0704e4da6e..513e0198b9 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/GrandKhavatari.xml
@@ -283,5 +283,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/HellKnight.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/HellKnight.xml
index 7ceb9128a3..161ff287ec 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/HellKnight.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/HellKnight.xml
@@ -298,5 +298,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Hierophant.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Hierophant.xml
index d27b1ade33..a729303ffd 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Hierophant.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Hierophant.xml
@@ -308,5 +308,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Maestro.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Maestro.xml
index 9cfe25f3b1..214b0c816e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Maestro.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Maestro.xml
@@ -258,5 +258,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/MoonlightSentinel.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/MoonlightSentinel.xml
index d346e089b3..10137568ad 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/MoonlightSentinel.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/MoonlightSentinel.xml
@@ -269,5 +269,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/MysticMuse.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/MysticMuse.xml
index 815286d2cf..bb93343070 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/MysticMuse.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/MysticMuse.xml
@@ -313,5 +313,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/PhoenixKnight.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/PhoenixKnight.xml
index 8aa409a2b4..933b03c00b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/PhoenixKnight.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/PhoenixKnight.xml
@@ -402,5 +402,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Sagittarius.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Sagittarius.xml
index 3092839227..786742f08d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Sagittarius.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Sagittarius.xml
@@ -226,5 +226,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ShillienSaint.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ShillienSaint.xml
index 52594e38a2..94d7e1559d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ShillienSaint.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ShillienSaint.xml
@@ -335,5 +335,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ShillienTemplar.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ShillienTemplar.xml
index 90f9aca0fc..c6ca4ef76d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ShillienTemplar.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/ShillienTemplar.xml
@@ -410,5 +410,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SoulHound.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SoulHound.xml
index f8caa38d1a..b2dc2aa867 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SoulHound.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SoulHound.xml
@@ -251,5 +251,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Soultaker.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Soultaker.xml
index 553a519c83..6bf4086788 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Soultaker.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Soultaker.xml
@@ -314,5 +314,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SpectralDancer.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SpectralDancer.xml
index 8e68c975cc..e06d970f97 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SpectralDancer.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SpectralDancer.xml
@@ -353,5 +353,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SpectralMaster.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SpectralMaster.xml
index b154b8ef1e..3dd39f66ad 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SpectralMaster.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/SpectralMaster.xml
@@ -279,5 +279,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/StormScreamer.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/StormScreamer.xml
index 09191e60e2..cf2047daa3 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/StormScreamer.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/StormScreamer.xml
@@ -303,5 +303,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Swordmuse.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Swordmuse.xml
index 8c4192df4b..49ca4b586b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Swordmuse.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Swordmuse.xml
@@ -278,5 +278,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Titan.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Titan.xml
index bbe0776a1d..4ce75b77bf 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Titan.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Titan.xml
@@ -324,5 +324,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Trickster.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Trickster.xml
index 39c7311309..79c9a36a9e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Trickster.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/Trickster.xml
@@ -207,5 +207,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/WindRider.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/WindRider.xml
index 8de678f572..77f1ad0d54 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/WindRider.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/3rdClass/WindRider.xml
@@ -314,5 +314,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightDarkElf.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightDarkElf.xml
index 00dbda32ae..f27a234786 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightDarkElf.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightDarkElf.xml
@@ -334,5 +334,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightElf.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightElf.xml
index 7aef4e30db..3b5196a27a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightElf.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightElf.xml
@@ -296,5 +296,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightHuman.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightHuman.xml
index 675d6d17a6..34fcc4e0fc 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightHuman.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/DeathKnight/DeathKnightHuman.xml
@@ -43,9 +43,6 @@
 		<skill skillName="Divine Inspiration" skillId="1405" skillLevel="4" getLevel="76" levelUpSp="8000000">
 			<item id="8621" count="1" /> <!-- Buff Expansion Book Lv. 4 -->
 		</skill>
-		<skill skillName="Mount Night Mare" skillId="54207" skillLevel="1" getLevel="76">
-			<item id="93383" count="1" /> <!-- Spellbook - Mount Nightmare Steed -->
-		</skill>
 		<skill skillName="Emergency Rescue" skillId="70" skillLevel="46" getLevel="76" levelUpSp="8000000" />
 		<skill skillName="Evolution Defense" skillId="45188" skillLevel="1" getLevel="76">
 			<item id="57" count="5000000" /> <!-- Adena -->
@@ -72,6 +69,9 @@
 		<skill skillName="Ultimate Death Knight Transformation" skillId="54206" skillLevel="1" getLevel="76" levelUpSp="8000000">
 			<item id="93387" count="1" /> <!-- Spellbook - Ultimate Death Knight Form -->
 		</skill>
+		<skill skillName="Mount Night Mare" skillId="54207" skillLevel="1" getLevel="76">
+			<item id="93383" count="1" /> <!-- Spellbook - Mount Nightmare Steed -->
+		</skill>
 
 		<skill skillName="Emergency Rescue" skillId="70" skillLevel="47" getLevel="77" levelUpSp="10000000" />
 		<skill skillName="Hellfire" skillId="45312" skillLevel="2" getLevel="77" levelUpSp="10000000" />
@@ -213,5 +213,40 @@
 		<skill skillName="Death Sword Mastery" skillId="45353" skillLevel="35" getLevel="90" levelUpSp="840000000" />
 		<skill skillName="Death Armor Mastery" skillId="45354" skillLevel="35" getLevel="90" levelUpSp="840000000" />
 		<skill skillName="Blessed by Sayha" skillId="45408" skillLevel="4" getLevel="90" levelUpSp="0" />
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="1" getLevel="88" autoGet="true" />
+		<skill skillName="Glorious Warrior's Special Teleport" skillId="45472" skillLevel="1" getLevel="88" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="1" getLevel="88" autoGet="true" />
+		
+		<skill skillName="Expand Glorious Warrior's Special Teleports" skillId="45473" skillLevel="1" getLevel="89" autoGet="true" />
+		
+		<skill skillName="Glorious Warrior's Unique Title Color" skillId="45474" skillLevel="1" getLevel="90" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Hair Accessory Slots" skillId="45475" skillLevel="1" getLevel="90" autoGet="true" />
+		<skill skillName="Glorious Warrior's Ability" skillId="45361" skillLevel="1" getLevel="90">
+			<item id="94046" count="1" /> <!-- Spellbook: Glorious Warrior's Ability Lv. 1 -->
+		</skill>
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="2" getLevel="91" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="2" getLevel="91" autoGet="true" />
+		<skill skillName="Glorious Warrior's Ability" skillId="45361" skillLevel="2" getLevel="91">
+			<item id="95890" count="1" /> <!-- Spellbook: Glorious Warrior's Ability Lv. 2 -->
+		</skill>
+		<skill skillName="Glorious Warrior's Resurrection Cost Decrease" skillId="47240" skillLevel="1" getLevel="91" autoGet="true" />
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="3" getLevel="92" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="3" getLevel="92" autoGet="true" />
+		<skill skillName="Glorious Warrior's Ability" skillId="45361" skillLevel="3" getLevel="92">
+			<item id="95891" count="1" /> <!-- Spellbook: Glorious Warrior's Ability Lv. 3 -->
+		</skill>
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="4" getLevel="93" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="4" getLevel="93" autoGet="true" />
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="5" getLevel="94" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="5" getLevel="94" autoGet="true" />
+		
+		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/Sylph/StormBlaster.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/Sylph/StormBlaster.xml
index e3d44596e9..dd6ddd4295 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/Sylph/StormBlaster.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/skillTrees/Sylph/StormBlaster.xml
@@ -187,5 +187,7 @@
 		
 		<skill skillName="Glorious Warrior's Elixir Upgrade" skillId="45471" skillLevel="6" getLevel="95" autoGet="true" />
 		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="6" getLevel="95" autoGet="true" />
+
+		<skill skillName="Expand Glorious Warrior's Magic Lamp" skillId="45483" skillLevel="7" getLevel="96" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/45400-45499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/45400-45499.xml
index 356868bda3..4e7c677ad8 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/45400-45499.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/skills/45400-45499.xml
@@ -2116,20 +2116,6 @@
 		<!-- Magic Lamp limit $s1 -->
 		<icon>icon.skill0000</icon>
 		<operateType>P</operateType>
-		<effects>
-			<effect name="ModifyMagicLampPoints">
-				<amount>
-					<value level="1">100</value>
-					<value level="2">200</value>
-					<value level="3">300</value>
-					<value level="4">400</value>
-					<value level="5">500</value>
-					<value level="6">600</value>
-					<value level="7">700</value>
-				</amount>
-				<mode>DIFF</mode>
-			</effect>
-		</effects>
 	</skill>
 	<skill id="45484" toLevel="45" name="Power Break">
 		<!-- <Shock skill> Attacks the enemy with $s1 power. Stuns for $s2 Ignores Shield Defense. -->
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
index 4e50d8cf2b..5bf77239fb 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/MagicLampData.java
@@ -71,7 +71,7 @@ public class MagicLampData implements IXmlReader
 	
 	public void addLampExp(Player player, double exp, boolean rateModifiers)
 	{
-		if (Config.ENABLE_MAGIC_LAMP)
+		if (Config.ENABLE_MAGIC_LAMP && (player.getLampCount() < player.getMaxLampCount()))
 		{
 			final int lampExp = (int) (exp * (rateModifiers ? Config.MAGIC_LAMP_CHARGE_RATE * player.getStat().getMul(Stat.MAGIC_LAMP_EXP_RATE, 1) : 1));
 			int calc = lampExp + player.getLampExp();
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
index ba6c2c8496..e72633bff5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Player.java
@@ -1281,19 +1281,24 @@ public class Player extends Playable
 		return getVariables().getInt(PlayerVariables.MAGIC_LAMP_EXP, 0);
 	}
 	
-	public int getLampCount()
-	{
-		return getVariables().getInt(PlayerVariables.MAGIC_LAMP_COUNT, 0);
-	}
-	
 	public void setLampExp(int exp)
 	{
 		getVariables().set(PlayerVariables.MAGIC_LAMP_EXP, exp);
 	}
 	
+	public int getLampCount()
+	{
+		return Math.min(getVariables().getInt(PlayerVariables.MAGIC_LAMP_COUNT, 0), getMaxLampCount());
+	}
+	
 	public void setLampCount(int count)
 	{
-		getVariables().set(PlayerVariables.MAGIC_LAMP_COUNT, count);
+		getVariables().set(PlayerVariables.MAGIC_LAMP_COUNT, Math.min(count, getMaxLampCount()));
+	}
+	
+	public int getMaxLampCount()
+	{
+		return Config.MAGIC_LAMP_MAX_GAME_COUNT + (getSkillLevel(45483) * 100); // Expand Glorious Warrior's Magic Lamp (45483).
 	}
 	
 	/**
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
index 5183d2f677..c7ff7789d9 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameInfoUI.java
@@ -21,7 +21,6 @@ import java.util.List;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketWriter;
 import org.l2jmobius.gameserver.data.xml.MagicLampData;
-import org.l2jmobius.gameserver.enums.LampMode;
 import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.GreaterMagicLampHolder;
 import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -47,31 +46,19 @@ public class ExMagicLampGameInfoUI implements IClientOutgoingPacket
 	public boolean write(PacketWriter packet)
 	{
 		OutgoingPackets.EX_MAGICLAMP_GAME_INFO.writeId(packet);
-		packet.writeD(Config.MAGIC_LAMP_MAX_GAME_COUNT); // nMagicLampGameMaxCCount
+		packet.writeD(_player.getMaxLampCount()); // nMagicLampGameMaxCCount
 		packet.writeD(_count); // cMagicLampGameCCount
-		switch (LampMode.getByMode(_mode))
-		{
-			case NORMAL:
-			{
-				packet.writeD(Config.MAGIC_LAMP_REWARD_COUNT);// cMagicLampCountPerGame
-				break;
-			}
-			case GREATER:
-			{
-				packet.writeD(Config.MAGIC_LAMP_GREATER_REWARD_COUNT); // cMagicLampCountPerGame
-				break;
-			}
-		}
+		packet.writeD(_mode == 0 ? Config.MAGIC_LAMP_REWARD_COUNT : Config.MAGIC_LAMP_GREATER_REWARD_COUNT); // cMagicLampCountPerGame
 		packet.writeD(_player.getLampCount()); // cMagicLampCount
 		packet.writeC(_mode); // cGameMode
 		final List<GreaterMagicLampHolder> greater = MagicLampData.getInstance().getGreaterLamps();
 		packet.writeD(greater.size()); // costItemList
-		greater.forEach(lamp ->
+		for (GreaterMagicLampHolder lamp : greater)
 		{
 			packet.writeD(lamp.getItemId()); // nItemClassID
 			packet.writeQ(lamp.getCount()); // nItemAmountPerGame
 			packet.writeQ(_player.getInventory().getInventoryItemCount(lamp.getItemId(), -1)); // nItemAmount
-		});
+		}
 		return true;
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
index a076f7ed40..d44ded9d1a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/network/serverpackets/magiclamp/ExMagicLampGameResult.java
@@ -112,13 +112,13 @@ public class ExMagicLampGameResult implements IClientOutgoingPacket
 	{
 		OutgoingPackets.EX_MAGICLAMP_GAME_RESULT.writeId(packet);
 		packet.writeD(_reward.size()); // magicLampGameResult
-		_reward.values().forEach(lamp ->
+		for (MagicLampHolder lamp : _reward.values())
 		{
 			packet.writeC(lamp.getType().getGrade()); // cGradeNum
 			packet.writeD(lamp.getCount()); // nRewardCount
 			packet.writeQ(lamp.getExp()); // nEXP
 			packet.writeQ(lamp.getSp()); // nSP
-		});
+		}
 		return true;
 	}
 }
\ No newline at end of file