diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/Fishing.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/Fishing.xml
index 23f35d2228..8e47a2c4d2 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/Fishing.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/Fishing.xml
@@ -25,6 +25,18 @@
 			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
 			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
 		</bait>
+		<bait itemId="48538" minPlayerLevel="102" chance="40" timeMin="105000" waitMin="15000"> <!-- Bait(R102) -->
+			<catch itemId="47550" chance="70" multiplier="1476" /> <!-- Ugly Fish -->
+			<catch itemId="47551" chance="25" multiplier="1804" /> <!-- Nimble Fish -->
+			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
+			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
+		</bait>
+		<bait itemId="48539" minPlayerLevel="105" chance="40" timeMin="105000" waitMin="15000"> <!-- Bait(R105) -->
+			<catch itemId="47550" chance="70" multiplier="1476" /> <!-- Ugly Fish -->
+			<catch itemId="47551" chance="25" multiplier="1804" /> <!-- Nimble Fish -->
+			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
+			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
+		</bait>
 		<bait itemId="47549" minPlayerLevel="85" chance="40" timeMin="105000" waitMin="15000"> <!-- PA Bait -->
 			<catch itemId="47550" chance="70" multiplier="1" /> <!-- Ugly Fish -->
 			<catch itemId="47551" chance="25" multiplier="1" /> <!-- Nimble Fish -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/buylists/3200700.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/buylists/3200700.xml
index 14ca7d170a..5d352e9c9b 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/buylists/3200700.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/buylists/3200700.xml
@@ -22,5 +22,7 @@
 	<item id="45493" /> <!-- Fishing Rod Pack (30-day) -->
 	<item id="47547" /> <!-- Bait -->
 	<item id="47548" /> <!-- Bait R99 -->
+	<item id="48538" /> <!-- Bait R102 -->
+	<item id="48539" /> <!-- Bait R105 -->
 	<item id="38154" /> <!-- Fishing Shot -->
 </list>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48500-48599.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48500-48599.xml
index b27e8c72b5..1694ad90ef 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48500-48599.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/items/48500-48599.xml
@@ -389,8 +389,9 @@
 		<!-- Fishing time: 105 sec. Standby time: 15 sec. Fishing bait available from level 102. Fishing with this bait has a low chance of yielding a Reddish Box. -->
 		<set name="icon" val="icon.etc_huge_lure" />
 		<set name="default_action" val="EQUIP" />
+		<set name="etcitem_type" val="LURE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="bodypart" val="lhand" />
 		<set name="price" val="25000" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -398,8 +399,9 @@
 		<!-- Fishing time: 105 sec. Standby time: 15 sec. Fishing bait available from level 105. Fishing with this bait has a low chance of yielding a Reddish Box. -->
 		<set name="icon" val="icon.etc_huge_lure" />
 		<set name="default_action" val="EQUIP" />
+		<set name="etcitem_type" val="LURE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="bodypart" val="lhand" />
 		<set name="price" val="30000" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -407,29 +409,81 @@
 		<!-- When used, increases P. Atk. by 3% or by 4% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_p_dmg" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39209" level="1" /> <!-- Fried Fish -->
+		</skills>
 	</item>
 	<item id="48541" name="Steamed Fish" additionalName="M. Atk." type="EtcItem">
 		<!-- When used, increases M. Atk. by 4% or by 5% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_m_dmg" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39210" level="1" /> <!-- Steamed Fish -->
+		</skills>
 	</item>
 	<item id="48542" name="Grilled Fish" additionalName="Combat Speed" type="EtcItem">
 		<!-- When used, increases Atk. Spd./ Casting Spd. by 3%, Speed by 4 or Atk. Spd./ Casting Spd. by 4%, Speed by 6 for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_pm_speed" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39211" level="1" /> <!-- Grilled Fish -->
+		</skills>
 	</item>
 	<item id="48543" name="Braised Fish" additionalName="Max HP/ MP" type="EtcItem">
 		<!-- When used, increases Max HP/ MP by 6% or by 8% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_hp_mp" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39212" level="1" /> <!-- Braised Fish -->
+		</skills>
 	</item>
 	<item id="48544" name="Royal Fish Soup" additionalName="Combat Prowess" type="EtcItem">
 		<!-- When used, increases P. Atk./ M. Atk. by 2%, Atk. Spd./ Casting Spd. by 2%, Max HP/ MP by 2% or P. Atk./ M. Atk. by 3%, Atk. Spd./ Casting Spd. by 3%, and Max HP/ MP by 3% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39200-39299.xml
index b304886d33..c8885cace7 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/39200-39299.xml
@@ -66,32 +66,95 @@
 		<reuseDelay>500</reuseDelay>
 	</skill>
 	<skill id="39209" toLevel="1" name="Fried Fish">
+		<!-- When used, increases P. Atk. by 3% or by 4% for 10 min. -->
 		<icon>icon.fish_stew_buff</icon>
-		<operateType>A1</operateType>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="PAtk">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39210" toLevel="1" name="Steamed Fish">
+		<!-- When used, increases M. Atk. by 4% or by 5% for 10 min. -->
 		<icon>icon.fish_stew_buff</icon>
-		<operateType>A1</operateType>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39211" toLevel="1" name="Grilled Fish">
+		<!-- When used, increases Atk. Spd./ Casting Spd. by 3%, Speed by 4 or Atk. Spd./ Casting Spd. by 4%, Speed by 6 for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<icon>icon.fish_stew_buff</icon>
-		<operateType>A1</operateType>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MagicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>6</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39212" toLevel="1" name="Braised Fish">
 		<icon>icon.fish_stew_buff</icon>
-		<operateType>A1</operateType>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MaxHp">
+				<amount>8</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>8</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39213" toLevel="1" name="Royal Fish Soup">
 		<icon>icon.fish_stew_buff</icon>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/Fishing.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/Fishing.xml
index 23f35d2228..8e47a2c4d2 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/Fishing.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/Fishing.xml
@@ -25,6 +25,18 @@
 			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
 			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
 		</bait>
+		<bait itemId="48538" minPlayerLevel="102" chance="40" timeMin="105000" waitMin="15000"> <!-- Bait(R102) -->
+			<catch itemId="47550" chance="70" multiplier="1476" /> <!-- Ugly Fish -->
+			<catch itemId="47551" chance="25" multiplier="1804" /> <!-- Nimble Fish -->
+			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
+			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
+		</bait>
+		<bait itemId="48539" minPlayerLevel="105" chance="40" timeMin="105000" waitMin="15000"> <!-- Bait(R105) -->
+			<catch itemId="47550" chance="70" multiplier="1476" /> <!-- Ugly Fish -->
+			<catch itemId="47551" chance="25" multiplier="1804" /> <!-- Nimble Fish -->
+			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
+			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
+		</bait>
 		<bait itemId="47549" minPlayerLevel="85" chance="40" timeMin="105000" waitMin="15000"> <!-- PA Bait -->
 			<catch itemId="47550" chance="70" multiplier="1" /> <!-- Ugly Fish -->
 			<catch itemId="47551" chance="25" multiplier="1" /> <!-- Nimble Fish -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/buylists/3200700.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/buylists/3200700.xml
index 14ca7d170a..5d352e9c9b 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/buylists/3200700.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/buylists/3200700.xml
@@ -22,5 +22,7 @@
 	<item id="45493" /> <!-- Fishing Rod Pack (30-day) -->
 	<item id="47547" /> <!-- Bait -->
 	<item id="47548" /> <!-- Bait R99 -->
+	<item id="48538" /> <!-- Bait R102 -->
+	<item id="48539" /> <!-- Bait R105 -->
 	<item id="38154" /> <!-- Fishing Shot -->
 </list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48500-48599.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48500-48599.xml
index a386d85c1c..9cb13cbb17 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48500-48599.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/items/48500-48599.xml
@@ -389,8 +389,9 @@
 		<!-- Fishing time: 105 sec. Standby time: 15 sec. Fishing bait available from level 102. Fishing with this bait has a low chance of yielding a Reddish Box. -->
 		<set name="icon" val="icon.etc_huge_lure" />
 		<set name="default_action" val="EQUIP" />
+		<set name="etcitem_type" val="LURE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="bodypart" val="lhand" />
 		<set name="price" val="25000" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -398,8 +399,9 @@
 		<!-- Fishing time: 105 sec. Standby time: 15 sec. Fishing bait available from level 105. Fishing with this bait has a low chance of yielding a Reddish Box. -->
 		<set name="icon" val="icon.etc_huge_lure" />
 		<set name="default_action" val="EQUIP" />
+		<set name="etcitem_type" val="LURE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="bodypart" val="lhand" />
 		<set name="price" val="30000" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -407,29 +409,81 @@
 		<!-- When used, increases P. Atk. by 3% or by 4% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_p_dmg" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39209" level="1" /> <!-- Fried Fish -->
+		</skills>
 	</item>
 	<item id="48541" name="Steamed Fish" additionalName="M. Atk." type="EtcItem">
 		<!-- When used, increases M. Atk. by 4% or by 5% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_m_dmg" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39210" level="1" /> <!-- Steamed Fish -->
+		</skills>
 	</item>
 	<item id="48542" name="Grilled Fish" additionalName="Combat Speed" type="EtcItem">
 		<!-- When used, increases Atk. Spd./ Casting Spd. by 3%, Speed by 4 or Atk. Spd./ Casting Spd. by 4%, Speed by 6 for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_pm_speed" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39211" level="1" /> <!-- Grilled Fish -->
+		</skills>
 	</item>
 	<item id="48543" name="Braised Fish" additionalName="Max HP/ MP" type="EtcItem">
 		<!-- When used, increases Max HP/ MP by 6% or by 8% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_hp_mp" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39212" level="1" /> <!-- Braised Fish -->
+		</skills>
 	</item>
 	<item id="48544" name="Royal Fish Soup" additionalName="Combat Prowess" type="EtcItem">
 		<!-- When used, increases P. Atk./ M. Atk. by 2%, Atk. Spd./ Casting Spd. by 2%, Max HP/ MP by 2% or P. Atk./ M. Atk. by 3%, Atk. Spd./ Casting Spd. by 3%, and Max HP/ MP by 3% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39200-39299.xml
index 250ac541b1..71ba63b8c3 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/39200-39299.xml
@@ -66,32 +66,95 @@
 		<reuseDelay>500</reuseDelay>
 	</skill>
 	<skill id="39209" toLevel="1" name="Fried Fish">
+		<!-- When used, increases P. Atk. by 3% or by 4% for 10 min. -->
 		<icon>icon.fish_stew_buff</icon>
-		<operateType>A1</operateType>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="PAtk">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39210" toLevel="1" name="Steamed Fish">
+		<!-- When used, increases M. Atk. by 4% or by 5% for 10 min. -->
 		<icon>icon.fish_stew_buff</icon>
-		<operateType>A1</operateType>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39211" toLevel="1" name="Grilled Fish">
+		<!-- When used, increases Atk. Spd./ Casting Spd. by 3%, Speed by 4 or Atk. Spd./ Casting Spd. by 4%, Speed by 6 for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<icon>icon.fish_stew_buff</icon>
-		<operateType>A1</operateType>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MagicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>6</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39212" toLevel="1" name="Braised Fish">
 		<icon>icon.fish_stew_buff</icon>
-		<operateType>A1</operateType>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MaxHp">
+				<amount>8</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>8</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39213" toLevel="1" name="Royal Fish Soup">
 		<icon>icon.fish_stew_buff</icon>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/Fishing.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/Fishing.xml
index 23f35d2228..8e47a2c4d2 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/Fishing.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/Fishing.xml
@@ -25,6 +25,18 @@
 			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
 			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
 		</bait>
+		<bait itemId="48538" minPlayerLevel="102" chance="40" timeMin="105000" waitMin="15000"> <!-- Bait(R102) -->
+			<catch itemId="47550" chance="70" multiplier="1476" /> <!-- Ugly Fish -->
+			<catch itemId="47551" chance="25" multiplier="1804" /> <!-- Nimble Fish -->
+			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
+			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
+		</bait>
+		<bait itemId="48539" minPlayerLevel="105" chance="40" timeMin="105000" waitMin="15000"> <!-- Bait(R105) -->
+			<catch itemId="47550" chance="70" multiplier="1476" /> <!-- Ugly Fish -->
+			<catch itemId="47551" chance="25" multiplier="1804" /> <!-- Nimble Fish -->
+			<catch itemId="47552" chance="3" multiplier="1968" /> <!-- Powerful Fish -->
+			<catch itemId="47554" chance="2" multiplier="1" /> <!-- Reddish Box -->
+		</bait>
 		<bait itemId="47549" minPlayerLevel="85" chance="40" timeMin="105000" waitMin="15000"> <!-- PA Bait -->
 			<catch itemId="47550" chance="70" multiplier="1" /> <!-- Ugly Fish -->
 			<catch itemId="47551" chance="25" multiplier="1" /> <!-- Nimble Fish -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/buylists/3200700.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/buylists/3200700.xml
index 14ca7d170a..5d352e9c9b 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/buylists/3200700.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/buylists/3200700.xml
@@ -22,5 +22,7 @@
 	<item id="45493" /> <!-- Fishing Rod Pack (30-day) -->
 	<item id="47547" /> <!-- Bait -->
 	<item id="47548" /> <!-- Bait R99 -->
+	<item id="48538" /> <!-- Bait R102 -->
+	<item id="48539" /> <!-- Bait R105 -->
 	<item id="38154" /> <!-- Fishing Shot -->
 </list>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/48500-48599.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/48500-48599.xml
index a386d85c1c..9cb13cbb17 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/48500-48599.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/items/48500-48599.xml
@@ -389,8 +389,9 @@
 		<!-- Fishing time: 105 sec. Standby time: 15 sec. Fishing bait available from level 102. Fishing with this bait has a low chance of yielding a Reddish Box. -->
 		<set name="icon" val="icon.etc_huge_lure" />
 		<set name="default_action" val="EQUIP" />
+		<set name="etcitem_type" val="LURE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="bodypart" val="lhand" />
 		<set name="price" val="25000" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -398,8 +399,9 @@
 		<!-- Fishing time: 105 sec. Standby time: 15 sec. Fishing bait available from level 105. Fishing with this bait has a low chance of yielding a Reddish Box. -->
 		<set name="icon" val="icon.etc_huge_lure" />
 		<set name="default_action" val="EQUIP" />
+		<set name="etcitem_type" val="LURE" />
 		<set name="immediate_effect" val="true" />
-		<set name="material" val="PAPER" />
+		<set name="bodypart" val="lhand" />
 		<set name="price" val="30000" />
 		<set name="is_stackable" val="true" />
 	</item>
@@ -407,29 +409,81 @@
 		<!-- When used, increases P. Atk. by 3% or by 4% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_p_dmg" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39209" level="1" /> <!-- Fried Fish -->
+		</skills>
 	</item>
 	<item id="48541" name="Steamed Fish" additionalName="M. Atk." type="EtcItem">
 		<!-- When used, increases M. Atk. by 4% or by 5% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_m_dmg" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39210" level="1" /> <!-- Steamed Fish -->
+		</skills>
 	</item>
 	<item id="48542" name="Grilled Fish" additionalName="Combat Speed" type="EtcItem">
 		<!-- When used, increases Atk. Spd./ Casting Spd. by 3%, Speed by 4 or Atk. Spd./ Casting Spd. by 4%, Speed by 6 for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_pm_speed" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39211" level="1" /> <!-- Grilled Fish -->
+		</skills>
 	</item>
 	<item id="48543" name="Braised Fish" additionalName="Max HP/ MP" type="EtcItem">
 		<!-- When used, increases Max HP/ MP by 6% or by 8% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
 		<set name="icon" val="icon.fishing_buff_hp_mp" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="material" val="PAPER" />
+		<set name="immediate_effect" val="true" />
+		<set name="weight" val="1" />
+		<set name="is_clan_depositable" val="true" />
+		<set name="is_mailable" val="true" />
+		<set name="is_tradable" val="true" />
+		<set name="is_dropable" val="true" />
+		<set name="is_sellable" val="true" />
+		<set name="is_private_storeable" val="true" />
+		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="ItemSkills" />
+		<skills>
+			<skill id="39212" level="1" /> <!-- Braised Fish -->
+		</skills>
 	</item>
 	<item id="48544" name="Royal Fish Soup" additionalName="Combat Prowess" type="EtcItem">
 		<!-- When used, increases P. Atk./ M. Atk. by 2%, Atk. Spd./ Casting Spd. by 2%, Max HP/ MP by 2% or P. Atk./ M. Atk. by 3%, Atk. Spd./ Casting Spd. by 3%, and Max HP/ MP by 3% for 10 min. Even if different types of fish dishes are used, only one effect applies. -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39200-39299.xml
index 6fef240c07..62db62058f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/stats/skills/39200-39299.xml
@@ -68,38 +68,94 @@
 	<skill id="39209" toLevel="1" name="Fried Fish">
 		<!-- Increases P. Atk. by 4% for 10 min. Can be stacked with Honey Vitality Beer. -->
 		<icon>icon.fishing_buff_p_dmg</icon>
-		<operateType>A1</operateType>
-		<isMagic>4</isMagic>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="PAtk">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39210" toLevel="1" name="Steamed Fish">
 		<!-- Increases M. Atk. by 5% for 10 min. Can be stacked with Honey Vitality Beer. -->
 		<icon>icon.fishing_buff_m_dmg</icon>
-		<operateType>A1</operateType>
-		<isMagic>4</isMagic>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MAtk">
+				<amount>5</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39211" toLevel="1" name="Grilled Fish">
 		<!-- Increases Atk. Spd./ Casting Spd. by 4%, Speed by 6 for 10 min. Can be stacked with Honey Vitality Beer. -->
 		<icon>icon.fishing_buff_pm_speed</icon>
-		<operateType>A1</operateType>
-		<isMagic>4</isMagic>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MagicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="PhysicalAttackSpeed">
+				<amount>4</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="Speed">
+				<amount>6</amount>
+				<mode>DIFF</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39212" toLevel="1" name="Braised Fish">
 		<!-- Increases Max HP/ MP by 8% for 10 min. Can be stacked with Honey Vitality Beer. -->
 		<icon>icon.fishing_buff_hp_mp</icon>
-		<operateType>A1</operateType>
-		<isMagic>4</isMagic>
-		<hitTime>500</hitTime>
-		<coolTime>500</coolTime>
-		<reuseDelay>5000</reuseDelay>
+		<operateType>A2</operateType>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>600</abnormalTime>
+		<abnormalType>BR_EVENT_BUF1</abnormalType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<hitTime>1000</hitTime>
+		<effectPoint>1</effectPoint>
+		<isMagic>2</isMagic>
+		<effects>
+			<effect name="MaxHp">
+				<amount>8</amount>
+				<mode>PER</mode>
+			</effect>
+			<effect name="MaxMp">
+				<amount>8</amount>
+				<mode>PER</mode>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="39213" toLevel="1" name="Royal Fish Soup">
 		<!-- Increases P. Atk./ M. Atk., Atk./ Casting Spd., Max HP/ MP by 3% for 10 min. Can be stacked with Honey Vitality Beer. -->