From bcd62a95dbbdc7fdd5b037e16f5d9e8414c13646 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 8 Oct 2022 14:31:39 +0000
Subject: [PATCH] Chuseok Harvest Festival improvements. Contributed by Sero
 and CostyKiller.

---
 .../game/data/stats/skills/39200-39299.xml    | 92 ++++---------------
 .../ChuseokHarvestFestival.java               | 11 ++-
 .../game/data/stats/skills/39200-39299.xml    |  5 +
 3 files changed, 35 insertions(+), 73 deletions(-)

diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39200-39299.xml
index c8fe947c45..26c44601b7 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/skills/39200-39299.xml
@@ -99,133 +99,81 @@
 		<!-- Fills your body with a special energy of the new world.\nFor 30 min., P./ M. Atk. +20%, Atk. Spd./ Casting Spd. +20%, Critical Rate for basic attacks, P./ M. Skill Critical Rate, Critical Damage for basic attacks and P./ M. Skill Critical Damage +20%, Speed +30.\nRemoved when entering the Olympiad or the Ceremony of Chaos. -->
 		<!-- level 2 Festival Fairy's Five-colored Sweets -->
 		<!-- For 30 min., Attribute Attack +70, Attribute Resistance +70, Vitality bonus +5%%.\nThe effect is removed when entering the Olympiad or the Ceremony of Chaos. -->
-		<icon>
-			<value level="1">icon.etc_charm_of_luck_i00</value>
-			<value level="2">icon.ev_ricecake_potion</value>
-		</icon>
+		<icon>icon.etc_charm_of_luck_i00</icon>
 		<operateType>A2</operateType>
-		<abnormalLevel>
-			<value level="1">1</value>
-			<value level="2">2</value>
-		</abnormalLevel>
+		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>1800</abnormalTime>
 		<abnormalType>SONGPYEN_BUFF</abnormalType>
+		<itemConsumeId>48520</itemConsumeId> <!-- Red Libra's Fortune Scroll -->
+		<itemConsumeCount>1</itemConsumeCount>
 		<canBeDispelled>false</canBeDispelled>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<blockedInOlympiad>true</blockedInOlympiad>
-		<reuseDelay>
-			<value level="1">5000</value>
-			<value level="2">2000</value>
-		</reuseDelay>
+		<reuseDelay>5000</reuseDelay>
 		<isMagic>4</isMagic>
 		<conditions>
 			<condition name="OpNotInEvent" />
 		</conditions>
 		<effects>
-			<effect name="AttackAttributeAdd" level="2">
-				<amount>100</amount>
-			</effect>
-			<effect name="DefenceAttribute" level="2">
-				<amount>100</amount>
-				<attribute>FIRE</attribute>
-			</effect>
-			<effect name="DefenceAttribute" level="2">
-				<amount>100</amount>
-				<attribute>WATER</attribute>
-			</effect>
-			<effect name="DefenceAttribute" level="2">
-				<amount>100</amount>
-				<attribute>WIND</attribute>
-			</effect>
-			<effect name="DefenceAttribute" level="2">
-				<amount>100</amount>
-				<attribute>EARTH</attribute>
-			</effect>
-			<effect name="DefenceAttribute" level="2">
-				<amount>100</amount>
-				<attribute>HOLY</attribute>
-			</effect>
-			<effect name="DefenceAttribute" level="2">
-				<amount>100</amount>
-				<attribute>DARK</attribute>
-			</effect>
 			<effect name="PAtk">
-				<amount>
-					<value level="1">20</value>
-					<value level="2">10</value>
-				</amount>
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MAtk">
-				<amount>
-					<value level="1">20</value>
-					<value level="2">10</value>
-				</amount>
+				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalSkillPower">
-				<amount>
-					<value level="1">1</value>
-					<value level="2">10</value>
-				</amount>
+				<amount>1</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalSkillPower">
-				<amount>
-					<value level="1">1</value>
-					<value level="2">10</value>
-				</amount>
+				<amount>1</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="PhysicalDefence">
-				<amount>
-					<value level="1">1</value>
-					<value level="2">20</value>
-				</amount>
+				<amount>1</amount>
 				<mode>PER</mode>
 			</effect>
 			<effect name="MagicalDefence">
-				<amount>
-					<value level="1">1</value>
-					<value level="2">20</value>
-				</amount>
+				<amount>1</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalAttackSpeed" level="1">
+			<effect name="PhysicalAttackSpeed">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicalAttackSpeed" level="1">
+			<effect name="MagicalAttackSpeed">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="CriticalRate" level="1">
+			<effect name="CriticalRate">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalSkillCriticalRate" level="1">
+			<effect name="PhysicalSkillCriticalRate">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicCriticalRate" level="1">
+			<effect name="MagicCriticalRate">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="CriticalDamage" level="1">
+			<effect name="CriticalDamage">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="PhysicalSkillCriticalDamage" level="1">
+			<effect name="PhysicalSkillCriticalDamage">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="MagicCriticalDamage" level="1">
+			<effect name="MagicCriticalDamage">
 				<amount>20</amount>
 				<mode>PER</mode>
 			</effect>
-			<effect name="Speed" level="1">
+			<effect name="Speed">
 				<amount>30</amount>
 				<mode>DIFF</mode>
 			</effect>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
index 988550a407..c4fbca30fe 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/events/ChuseokHarvestFestival/ChuseokHarvestFestival.java
@@ -65,6 +65,15 @@ public class ChuseokHarvestFestival extends LongTimeEvent
 		String htmltext = null;
 		switch (event)
 		{
+			case "34604.htm":
+			case "34604-1.htm":
+			case "34605.htm":
+			case "34605-1.htm":
+			case "34605-2.htm":
+			{
+				htmltext = event;
+				break;
+			}
 			case "getTicket":
 			{
 				if (npc.getId() != FULL_MOON)
@@ -104,7 +113,7 @@ public class ChuseokHarvestFestival extends LongTimeEvent
 					break;
 				}
 				
-				SkillCaster.triggerCast(npc, player, ENERGY_BUFF.getSkill());
+				SkillCaster.triggerCast(player, player, ENERGY_BUFF.getSkill());
 				break;
 			}
 			case "moveToTheMoon":
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39200-39299.xml
index aab3b619ce..62b86fa752 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/skills/39200-39299.xml
@@ -134,6 +134,11 @@
 		</abnormalLevel>
 		<abnormalTime>1800</abnormalTime>
 		<abnormalType>SONGPYEN_BUFF</abnormalType>
+		<itemConsumeId>
+			<value level="1">48520</value> <!-- Newbie's Fortune Scroll -->
+			<value level="2">48225</value> <!-- Multicolored Songpyeon -->
+		</itemConsumeId>
+		<itemConsumeCount>1</itemConsumeCount>
 		<canBeDispelled>false</canBeDispelled>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>