lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fishing additions.

Browse Source
This commit is contained in:
MobiusDev
2016-12-18 13:15:11 +00:00
parent 8a9b048719
commit 106fdd6c93
13 changed files with 252 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Underground/dist/game/data/html/admin/teleports/OtherLocations.htm vendored
View File

@@ -36,7 +36,7 @@
</tr> </tr>
<tr> <tr>
<td align=center><button action="bypass -h admin_move_to -114700 147909 -7715" value="Harnak Underground" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td> <td align=center><button action="bypass -h admin_move_to -114700 147909 -7715" value="Harnak Underground" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td align=center></td> <td align=center><button action="bypass -h admin_html teleports/OtherLocations/fishing.htm" value="Fishing Locations" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr></table> </tr></table>
</center> </center>
</body></html> </body></html>

30
L2J_Mobius_Underground/dist/game/data/html/admin/teleports/OtherLocations/fishing.htm vendored Normal file
View File

@@ -0,0 +1,30 @@
<html><title>Admin Teleports</title><body>
<center>
<table width=256><tr>
<td align=center><button value="Main" action="bypass -h admin_admin" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td align=center width=176>Fishing Zones</td>
<td align=center><button value="Back" action="bypass -h admin_html teleports/OtherLocations.htm" width=40 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr></table><br>
<table width=256><tr>
<td align=center><button action="bypass -h admin_move_to 83892 142450 -3533" value="Giran" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td align=center><button action="bypass -h admin_move_to 51860 187473 -3626" value="Giran Harbor" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr>
<tr>
<td align=center><button action="bypass -h admin_move_to -24173 93765 -3601" value="Gludio" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td align=center><button action="bypass -h admin_move_to -3473 72118 -3594" value="Neutral Zone" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr>
<tr>
<td align=center><button action="bypass -h admin_move_to -53999 127884 -3090" value="Fellmere Lake" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td align=center><button action="bypass -h admin_move_to 144799 46581 -3435" value="Narsell Lake" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr>
<tr>
<td align=center><button action="bypass -h admin_move_to 53728 79247 -3630" value="Iris Lake" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td align=center><button action="bypass -h admin_move_to 67681 86891 -3722" value="Timak Outpost" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
</tr>
<tr>
<td align=center><button action="bypass -h admin_move_to 111938 225419 -3626" value="Heine" width=128 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
<td align=center></td>
</tr>
</table>
</center>
</body></html>

4
L2J_Mobius_Underground/dist/game/data/stats/items/07000-07099.xml vendored
View File

@@ -1094,6 +1094,7 @@
<item id="7067" name="Special Bait 1" type="EtcItem"> <item id="7067" name="Special Bait 1" type="EtcItem">
<!-- Special bait used to obtain treasure chest. --> <!-- Special bait used to obtain treasure chest. -->
<set name="icon" val="icon.etc_ultra_bomb_i00" /> <set name="icon" val="icon.etc_ultra_bomb_i00" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />
@@ -1106,6 +1107,7 @@
<item id="7068" name="Special Bait 2" type="EtcItem"> <item id="7068" name="Special Bait 2" type="EtcItem">
<!-- Special bait used to obtain treasure chest. --> <!-- Special bait used to obtain treasure chest. -->
<set name="icon" val="icon.etc_ultra_bomb_i00" /> <set name="icon" val="icon.etc_ultra_bomb_i00" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />
@@ -1118,6 +1120,7 @@
<item id="7069" name="Special Bait 3" type="EtcItem"> <item id="7069" name="Special Bait 3" type="EtcItem">
<!-- Special bait used to obtain treasure chest. --> <!-- Special bait used to obtain treasure chest. -->
<set name="icon" val="icon.etc_ultra_bomb_i00" /> <set name="icon" val="icon.etc_ultra_bomb_i00" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />
@@ -1130,6 +1133,7 @@
<item id="7070" name="Special Bait 4" type="EtcItem"> <item id="7070" name="Special Bait 4" type="EtcItem">
<!-- Special bait used to obtain treasure chest. --> <!-- Special bait used to obtain treasure chest. -->
<set name="icon" val="icon.etc_ultra_bomb_i00" /> <set name="icon" val="icon.etc_ultra_bomb_i00" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />

4
L2J_Mobius_Underground/dist/game/data/stats/items/07600-07699.xml vendored
View File

@@ -165,6 +165,7 @@
<item id="7610" name="Wind Bait" type="EtcItem"> <item id="7610" name="Wind Bait" type="EtcItem">
<!-- Lure that was given out by Lanosco. It contains the hidden power of wind. It is not easy to use this bait. Only those who are highly skilled in fishing should use it. --> <!-- Lure that was given out by Lanosco. It contains the hidden power of wind. It is not easy to use this bait. Only those who are highly skilled in fishing should use it. -->
<set name="icon" val="icon.etc_broken_crystal_silver_i00" /> <set name="icon" val="icon.etc_broken_crystal_silver_i00" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />
@@ -178,6 +179,7 @@
<item id="7611" name="Icy Air Bait" type="EtcItem"> <item id="7611" name="Icy Air Bait" type="EtcItem">
<!-- Lure that was given out by O'Fulle. It contains the hidden power of icy air. It is not easy to use this bait. Only those who are highly skilled in fishing should use it. --> <!-- Lure that was given out by O'Fulle. It contains the hidden power of icy air. It is not easy to use this bait. Only those who are highly skilled in fishing should use it. -->
<set name="icon" val="icon.etc_broken_crystal_blue_i00" /> <set name="icon" val="icon.etc_broken_crystal_blue_i00" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />
@@ -191,6 +193,7 @@
<item id="7612" name="Earth Bait" type="EtcItem"> <item id="7612" name="Earth Bait" type="EtcItem">
<!-- Lure that was given out by Willie. It contains the hidden power of earth. It is not easy to use this bait. Only those who are highly skilled in fishing should use it. --> <!-- Lure that was given out by Willie. It contains the hidden power of earth. It is not easy to use this bait. Only those who are highly skilled in fishing should use it. -->
<set name="icon" val="icon.etc_broken_crystal_gold_i00" /> <set name="icon" val="icon.etc_broken_crystal_gold_i00" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />
@@ -204,6 +207,7 @@
<item id="7613" name="Flaming Bait" type="EtcItem"> <item id="7613" name="Flaming Bait" type="EtcItem">
<!-- Lure that was given out by Linnaeus. It contains the hidden power of flames. It is not easy to use this bait. Only those who are highly skilled in fishing should use it. --> <!-- Lure that was given out by Linnaeus. It contains the hidden power of flames. It is not easy to use this bait. Only those who are highly skilled in fishing should use it. -->
<set name="icon" val="icon.etc_broken_crystal_red_i00" /> <set name="icon" val="icon.etc_broken_crystal_red_i00" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />

12
L2J_Mobius_Underground/dist/game/data/stats/items/45400-45499.xml vendored
View File

@@ -1040,11 +1040,17 @@
<item id="45493" name="Fishing Rod Pack (30-day)" type="EtcItem"> <item id="45493" name="Fishing Rod Pack (30-day)" type="EtcItem">
<!-- Open to get a 30-day fishing rod. --> <!-- Open to get a 30-day fishing rod. -->
<set name="icon" val="icon.etc_box_of_adventure_1_i00" /> <set name="icon" val="icon.etc_box_of_adventure_1_i00" />
<set name="weight" val="100" /> <set name="default_action" val="PEEL" />
<set name="price" val="5000000" /> <set name="handler" val="ExtractableItems" />
<set name="immediate_effect" val="true" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_freightable" val="false" /> <set name="is_freightable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="price" val="5000000" />
<set name="weight" val="100" />
<capsuled_items>
<item id="45492" min="1" max="1" chance="100" /> <!-- Normal Fishing Rod - 30-day -->
</capsuled_items>
</item> </item>
<item id="45494" name="Sturdy Fishing Rod" type="Weapon"> <item id="45494" name="Sturdy Fishing Rod" type="Weapon">
<!-- A sturdy fishing rod. Consumes 1 Fishing Shot. --> <!-- A sturdy fishing rod. Consumes 1 Fishing Shot. -->
@@ -1067,6 +1073,7 @@
<item id="45495" name="Normal Bait" type="EtcItem"> <item id="45495" name="Normal Bait" type="EtcItem">
<!-- Bait for fishing. Use to catch fresh fish. --> <!-- Bait for fishing. Use to catch fresh fish. -->
<set name="icon" val="icon.etc_huge_lure" /> <set name="icon" val="icon.etc_huge_lure" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />
@@ -1079,6 +1086,7 @@
<item id="45496" name="Special Bait" type="EtcItem"> <item id="45496" name="Special Bait" type="EtcItem">
<!-- Special bait for fishing. Use to catch shiny fish. --> <!-- Special bait for fishing. Use to catch shiny fish. -->
<set name="icon" val="icon.etc_gludio_fish_lure_i00" /> <set name="icon" val="icon.etc_gludio_fish_lure_i00" />
<set name="bodypart" val="lhand" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />
<set name="material" val="LIQUID" /> <set name="material" val="LIQUID" />

1
L2J_Mobius_Underground/dist/game/data/stats/items/46000-46099.xml vendored
View File

@@ -1118,6 +1118,7 @@
<item id="46084" name="Player Commendation Special Bait" additionalName="PC-exclusive" type="EtcItem"> <item id="46084" name="Player Commendation Special Bait" additionalName="PC-exclusive" type="EtcItem">
<!-- Special bait for fishing. You can get Treasure Map Pieces when fishing with it. Can be used outside a PC. --> <!-- Special bait for fishing. You can get Treasure Map Pieces when fishing with it. Can be used outside a PC. -->
<set name="icon" val="icon.etc_bait_i02" /> <set name="icon" val="icon.etc_bait_i02" />
<set name="bodypart" val="lhand" />
<set name="default_action" val="EQUIP" /> <set name="default_action" val="EQUIP" />
<set name="etcitem_type" val="LURE" /> <set name="etcitem_type" val="LURE" />
<set name="immediate_effect" val="true" /> <set name="immediate_effect" val="true" />

1
L2J_Mobius_Underground/dist/game/data/stats/items/46200-46299.xml vendored
View File

@@ -1092,6 +1092,7 @@
<item id="46284" name="Exclusive Christmas Bait" type="EtcItem"> <item id="46284" name="Exclusive Christmas Bait" type="EtcItem">
<!-- Exclusive Christmas bait. Use it to catch Fish Gift Boxes. Will be deleted after the event. --> <!-- Exclusive Christmas bait. Use it to catch Fish Gift Boxes. Will be deleted after the event. -->
<set name="icon" val="icon.etc_bait_i00" /> <set name="icon" val="icon.etc_bait_i00" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_freightable" val="false" /> <set name="is_freightable" val="false" />

8
L2J_Mobius_Underground/dist/game/data/stats/items/46400-46499.xml vendored
View File

@@ -267,6 +267,7 @@
<item id="46420" name="Sheep Bait" type="EtcItem"> <item id="46420" name="Sheep Bait" type="EtcItem">
<!-- Bait for fishing. Catch the same items as when fishing with regular bait, and get more XP. Under Lv. 85 only. Deleted after event. --> <!-- Bait for fishing. Catch the same items as when fishing with regular bait, and get more XP. Under Lv. 85 only. Deleted after event. -->
<set name="icon" val="icon.etc_night_normal_lure" /> <set name="icon" val="icon.etc_night_normal_lure" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@@ -280,6 +281,7 @@
<item id="46421" name="R Sheep Bait" type="EtcItem"> <item id="46421" name="R Sheep Bait" type="EtcItem">
<!-- Bait for fishing. Catch same items as when fishing with regular bait, and get more XP. Can be used by characters Lv. 85 - 94. Deleted after event. --> <!-- Bait for fishing. Catch same items as when fishing with regular bait, and get more XP. Can be used by characters Lv. 85 - 94. Deleted after event. -->
<set name="icon" val="icon.etc_night_normal_lure" /> <set name="icon" val="icon.etc_night_normal_lure" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@@ -293,6 +295,7 @@
<item id="46422" name="R95 Sheep Bait" type="EtcItem"> <item id="46422" name="R95 Sheep Bait" type="EtcItem">
<!-- Bait for fishing. Catch same items as when fishing with regular bait, and get more XP. Can be used by characters Lv. 95 - 98. Deleted after event. --> <!-- Bait for fishing. Catch same items as when fishing with regular bait, and get more XP. Can be used by characters Lv. 95 - 98. Deleted after event. -->
<set name="icon" val="icon.etc_night_normal_lure" /> <set name="icon" val="icon.etc_night_normal_lure" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@@ -306,6 +309,7 @@
<item id="46423" name="R99 Sheep Bait" type="EtcItem"> <item id="46423" name="R99 Sheep Bait" type="EtcItem">
<!-- Bait for fishing. Catch same items as when fishing with regular bait, and get more XP. Lv. 99 or above. Deleted after event. --> <!-- Bait for fishing. Catch same items as when fishing with regular bait, and get more XP. Lv. 99 or above. Deleted after event. -->
<set name="icon" val="icon.etc_night_normal_lure" /> <set name="icon" val="icon.etc_night_normal_lure" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@@ -492,6 +496,7 @@
<item id="46435" name="Heine Special Bait (85-89)" type="EtcItem"> <item id="46435" name="Heine Special Bait (85-89)" type="EtcItem">
<!-- Bait for fishing. Catch fresh fish and whales. Has a very low chance of obtaining Wind Vitality Tonic, Heine Treasure Chest, or a Zodiac Agathion Box. Can be used by characters Lv. 85 - 89. --> <!-- Bait for fishing. Catch fresh fish and whales. Has a very low chance of obtaining Wind Vitality Tonic, Heine Treasure Chest, or a Zodiac Agathion Box. Can be used by characters Lv. 85 - 89. -->
<set name="icon" val="icon.etc_bm_lure_i00" /> <set name="icon" val="icon.etc_bm_lure_i00" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@@ -505,6 +510,7 @@
<item id="46436" name="Heine Special Bait (90-94)" type="EtcItem"> <item id="46436" name="Heine Special Bait (90-94)" type="EtcItem">
<!-- Bait for fishing. Catch fresh fish and whales. Has a very low chance of obtaining Wind Vitality Tonic, Heine Treasure Chest, or a Zodiac Agathion Box. Can be used by characters Lv. 90 - 94. --> <!-- Bait for fishing. Catch fresh fish and whales. Has a very low chance of obtaining Wind Vitality Tonic, Heine Treasure Chest, or a Zodiac Agathion Box. Can be used by characters Lv. 90 - 94. -->
<set name="icon" val="icon.etc_bm_lure_i00" /> <set name="icon" val="icon.etc_bm_lure_i00" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@@ -518,6 +524,7 @@
<item id="46437" name="Heine Special Bait (95-98)" type="EtcItem"> <item id="46437" name="Heine Special Bait (95-98)" type="EtcItem">
<!-- Bait for fishing. Catch fresh fish and whales. Has a very low chance of obtaining Wind Vitality Tonic, Heine Treasure Chest, or a Zodiac Agathion Box. Can be used by characters Lv. 95 - 98. --> <!-- Bait for fishing. Catch fresh fish and whales. Has a very low chance of obtaining Wind Vitality Tonic, Heine Treasure Chest, or a Zodiac Agathion Box. Can be used by characters Lv. 95 - 98. -->
<set name="icon" val="icon.etc_bm_lure_i00" /> <set name="icon" val="icon.etc_bm_lure_i00" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />
@@ -531,6 +538,7 @@
<item id="46438" name="Heine Special Bait (99~)" type="EtcItem"> <item id="46438" name="Heine Special Bait (99~)" type="EtcItem">
<!-- Bait for fishing. Catch fresh fish and whales. Has a very low chance of obtaining Wind Vitality Tonic, Heine Treasure Chest, or a Zodiac Agathion Box. Lv. 99 or above. --> <!-- Bait for fishing. Catch fresh fish and whales. Has a very low chance of obtaining Wind Vitality Tonic, Heine Treasure Chest, or a Zodiac Agathion Box. Lv. 99 or above. -->
<set name="icon" val="icon.etc_bm_lure_i00" /> <set name="icon" val="icon.etc_bm_lure_i00" />
<set name="bodypart" val="lhand" />
<set name="is_clan_depositable" val="false" /> <set name="is_clan_depositable" val="false" />
<set name="is_mailable" val="false" /> <set name="is_mailable" val="false" />
<set name="is_tradable" val="false" /> <set name="is_tradable" val="false" />

313
L2J_Mobius_Underground/dist/game/data/zones/fishing.xml vendored
View File

@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/zones.xsd"> <list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/zones.xsd">
<!-- Fishing Zones --> <zone name="fishing_giran_1" type="FishingZone" shape="NPoly" minZ="-3600" maxZ="-3350">
<!-- Giran wizard guide bridge 1 -->
<zone name="fishing_giran1" type="FishingZone" shape="NPoly" minZ="-3350" maxZ="-3600">
<node X="85091" Y="150247" /> <node X="85091" Y="150247" />
<node X="85630" Y="150238" /> <node X="85630" Y="150238" />
<node X="85639" Y="152251" /> <node X="85639" Y="152251" />
@@ -16,161 +14,184 @@
<node X="86489" Y="150163" /> <node X="86489" Y="150163" />
<node X="85087" Y="150138" /> <node X="85087" Y="150138" />
</zone> </zone>
<!-- Giran bridge 2 --> <zone name="fishing_giran_2" type="FishingZone" shape="NPoly" minZ="-3550" maxZ="-3500">
<zone name="fishing_giran2" type="FishingZone" shape="NPoly" minZ="-3500" maxZ="-3550">
<node X="88666" Y="147527" /> <node X="88666" Y="147527" />
<node X="90406" Y="147527" /> <node X="90406" Y="147527" />
<node X="90406" Y="147185" /> <node X="90406" Y="147185" />
<node X="88680" Y="147185" /> <node X="88680" Y="147185" />
</zone> </zone>
<!-- Giran bridge 3 --> <zone name="fishing_giran_3" type="FishingZone" shape="NPoly" minZ="-3550" maxZ="-3500">
<zone name="fishing_giran3" type="FishingZone" shape="NPoly" minZ="-3500" maxZ="-3550">
<node X="84068" Y="143243" /> <node X="84068" Y="143243" />
<node X="84069" Y="141532" /> <node X="84069" Y="141532" />
<node X="83707" Y="141527" /> <node X="83707" Y="141527" />
<node X="83703" Y="143244" /> <node X="83703" Y="143244" />
</zone> </zone>
<zone name="fishing_giran_harbor" type="FishingZone" shape="NPoly" minZ="-3700" maxZ="-3300">
<!-- Gludio --> <node X="50727" Y="184858" />
<zone name="fishing_gludio1" type="FishingZone" shape="NPoly" minZ="-3700" maxZ="-3800"> <node X="48874" Y="186940" />
<node X="-1518" Y="129784" /> <node X="46463" Y="188239" />
<node X="-2948" Y="128842" /> <node X="45663" Y="186532" />
<node X="-7076" Y="127523" /> <node X="43848" Y="187494" />
<node X="-8648" Y="126475" /> <node X="44631" Y="188770" />
<node X="-9276" Y="125657" /> <node X="42568" Y="189871" />
<node X="-9813" Y="124706" /> <node X="44155" Y="193268" />
<node X="-9177" Y="124840" /> <node X="50252" Y="190691" />
<node X="-8715" Y="125891" /> <node X="53136" Y="186640" />
<node X="-8313" Y="126338" />
<node X="-7256" Y="127037" />
<node X="-6571" Y="127298" />
<node X="-5141" Y="127443" />
<node X="-2849" Y="128298" />
<node X="-1292" Y="129509" />
</zone> </zone>
<zone name="fishing_gludio2" type="FishingZone" shape="NPoly" minZ="-3700" maxZ="-3800"> <zone name="fishing_gludio" type="FishingZone" shape="NPoly" minZ="-3750" maxZ="-3300">
<node X="-343" Y="128692" /> <node X="-23044" Y="89592" />
<node X="-1896" Y="127021" /> <node X="-21616" Y="90157" />
<node X="-3789" Y="126884" /> <node X="-21738" Y="92192" />
<node X="-4095" Y="126639" /> <node X="-20695" Y="97234" />
<node X="-2200" Y="120084" /> <node X="-19659" Y="101052" />
<node X="-947" Y="118820" /> <node X="-20780" Y="103199" />
<node X="-349" Y="117887" /> <node X="-22402" Y="102506" />
<node X="-642" Y="117202" /> <node X="-23707" Y="95414" />
<node X="-1643" Y="118849" /> <node X="-24862" Y="92989" />
<node X="-2758" Y="119877" /> <node X="-24736" Y="90789" />
<node X="-3836" Y="121742" />
<node X="-5792" Y="126659" />
<node X="-4375" Y="127619" />
<node X="-1912" Y="127801" />
<node X="-550" Y="129462" />
</zone> </zone>
<zone name="fishing_gludio3" type="FishingZone" shape="NPoly" minZ="-3700" maxZ="-3800"> <zone name="fishing_neutral_zone" type="FishingZone" shape="NPoly" minZ="-3750" maxZ="-3300">
<node X="-253" Y="117460" /> <node X="-16088" Y="71610" />
<node X="234" Y="116947" /> <node X="-15221" Y="70732" />
<node X="538" Y="116314" /> <node X="-11762" Y="67946" />
<node X="798" Y="115665" /> <node X="-10059" Y="68442" />
<node X="963" Y="115200" /> <node X="-2025" Y="72000" />
<node X="1368" Y="114433" /> <node X="-699" Y="76367" />
<node X="1585" Y="114063" /> <node X="-2856" Y="77678" />
<node X="1907" Y="113777" /> <node X="-3380" Y="76798" />
<node X="2092" Y="113390" /> <node X="-6905" Y="73148" />
<node X="2668" Y="112595" /> <node X="-11297" Y="71870" />
<node X="2799" Y="111560" /> <node X="-13486" Y="72168" />
<node X="2870" Y="109781" /> <node X="-14542" Y="73088" />
<node X="2888" Y="108711" />
<node X="2928" Y="107636" />
<node X="3020" Y="106769" />
<node X="3324" Y="104453" />
<node X="3625" Y="102967" />
<node X="3665" Y="101395" />
<node X="3661" Y="99786" />
<node X="3711" Y="98073" />
<node X="3496" Y="97517" />
<node X="3434" Y="97037" />
<node X="3350" Y="96641" />
<node X="3244" Y="96415" />
<node X="2986" Y="96413" />
<node X="2990" Y="97977" />
<node X="3089" Y="99246" />
<node X="2999" Y="101355" />
<node X="3058" Y="103263" />
<node X="2393" Y="107304" />
<node X="2203" Y="109419" />
<node X="2172" Y="111385" />
<node X="2019" Y="112524" />
<node X="503" Y="114489" />
<node X="-896" Y="117202" />
</zone> </zone>
<zone name="fishing_gludio4" type="FishingZone" shape="NPoly" minZ="-3700" maxZ="-3800"> <zone name="fishing_fellmere_lake" type="FishingZone" shape="NPoly" minZ="-3650" maxZ="-2200">
<node X="-3791" Y="119524" /> <node X="-55351" Y="128912" />
<node X="-2531" Y="117642" /> <node X="-55974" Y="131960" />
<node X="-202" Y="113955" /> <node X="-61124" Y="133034" />
<node X="720" Y="112818" /> <node X="-63346" Y="132706" />
<node X="787" Y="112391" /> <node X="-63622" Y="137127" />
<node X="1129" Y="112200" /> <node X="-63943" Y="139991" />
<node X="1251" Y="111487" /> <node X="-66278" Y="138637" />
<node X="1337" Y="110193" /> <node X="-70269" Y="133704" />
<node X="1442" Y="107930" /> <node X="-68687" Y="129352" />
<node X="1532" Y="106191" /> <node X="-61255" Y="125857" />
<node X="1659" Y="105938" /> <node X="-61634" Y="122648" />
<node X="1724" Y="105202" /> <node X="-64758" Y="120838" />
<node X="1777" Y="104992" /> <node X="-65553" Y="115366" />
<node X="1705" Y="103492" /> <node X="-63965" Y="112894" />
<node X="1969" Y="102521" /> <node X="-62075" Y="113109" />
<node X="2109" Y="101732" /> <node X="-60208" Y="114967" />
<node X="1814" Y="100411" /> <node X="-58091" Y="120419" />
<node X="1987" Y="99617" /> <node X="-58399" Y="122746" />
<node X="1803" Y="98090" /> <node X="-55645" Y="122787" />
<node X="1243" Y="96612" /> <node X="-52452" Y="124898" />
<node X="909" Y="94828" /> <node X="-52589" Y="127015" />
<node X="856" Y="91340" /> </zone>
<node X="1509" Y="89093" /> <zone name="fishing_narsell_lake" type="FishingZone" shape="NPoly" minZ="-3750" maxZ="-3200">
<node X="1691" Y="87765" /> <node X="143476" Y="46677" />
<node X="848" Y="85198" /> <node X="143378" Y="47597" />
<node X="891" Y="83391" /> <node X="141912" Y="48300" />
<node X="908" Y="82872" /> <node X="140149" Y="46938" />
<node X="568" Y="80256" /> <node X="137895" Y="47855" />
<node X="622" Y="79788" /> <node X="137190" Y="50320" />
<node X="302" Y="79295" /> <node X="137840" Y="51469" />
<node X="-364" Y="79389" /> <node X="139300" Y="52548" />
<node X="-1407" Y="78162" /> <node X="137961" Y="54671" />
<node X="-1705" Y="77772" /> <node X="136828" Y="57481" />
<node X="-2385" Y="77532" /> <node X="138792" Y="59808" />
<node X="-1118" Y="76157" /> <node X="143935" Y="59893" />
<node X="-1077" Y="76427" /> <node X="148324" Y="59026" />
<node X="-692" Y="76936" /> <node X="149082" Y="58032" />
<node X="-121" Y="77695" /> <node X="151890" Y="58634" />
<node X="1040" Y="78888" /> <node X="153262" Y="57498" />
<node X="1359" Y="79166" /> <node X="152659" Y="55271" />
<node X="1818" Y="79391" /> <node X="153196" Y="54110" />
<node X="2199" Y="79906" /> <node X="154187" Y="53247" />
<node X="2360" Y="81570" /> <node X="155423" Y="53209" />
<node X="2394" Y="82455" /> <node X="157125" Y="54176" />
<node X="2653" Y="84169" /> <node X="158716" Y="53215" />
<node X="3100" Y="86224" /> <node X="158622" Y="52273" />
<node X="3418" Y="87678" /> <node X="160864" Y="51337" />
<node X="3343" Y="88728" /> <node X="161582" Y="50347" />
<node X="3051" Y="89876" /> <node X="161667" Y="48356" />
<node X="2894" Y="90654" /> <node X="159959" Y="45092" />
<node X="2748" Y="91571" /> <node X="157666" Y="45539" />
<node X="2788" Y="92221" /> <node X="157071" Y="47916" />
<node X="2756" Y="92462" /> <node X="155858" Y="47763" />
<node X="2731" Y="92822" /> <node X="155654" Y="46743" />
<node X="2073" Y="93660" /> <node X="155780" Y="42906" />
<node X="1712" Y="95174" /> <node X="157608" Y="42222" />
<node X="2025" Y="96361" /> <node X="158460" Y="40748" />
<node X="1899" Y="97130" /> <node X="158487" Y="39104" />
<node X="2345" Y="98560" /> <node X="156930" Y="37678" />
<node X="2548" Y="100263" /> <node X="152085" Y="36185" />
<node X="2424" Y="101747" /> <node X="146922" Y="37298" />
<node X="2502" Y="102799" /> <node X="144899" Y="36565" />
<node X="2155" Y="105041" /> <node X="141637" Y="37684" />
<node X="1951" Y="107100" /> <node X="138935" Y="39332" />
<node X="1850" Y="110443" /> <node X="137809" Y="40536" />
<node X="1698" Y="113246" /> <node X="138040" Y="41586" />
<node X="387" Y="114614" /> <node X="139209" Y="42805" />
<node X="-817" Y="115678" /> <node X="141751" Y="43654" />
<node X="-3188" Y="119289" /> <node X="142611" Y="44584" />
<node X="143468" Y="46767" />
<node X="146394" Y="46766" />
<node X="146387" Y="48012" />
<node X="147497" Y="49447" />
<node X="151510" Y="49446" />
<node X="152585" Y="48008" />
<node X="152590" Y="45439" />
<node X="151506" Y="43999" />
<node X="147503" Y="43998" />
<node X="146384" Y="45443" />
<node X="146389" Y="46695" />
</zone>
<zone name="fishing_iris_lake" type="FishingZone" shape="NPoly" minZ="-3800" maxZ="-3250">
<node X="37154" Y="68179" />
<node X="38801" Y="68085" />
<node X="40777" Y="71129" />
<node X="46441" Y="70716" />
<node X="51580" Y="71869" />
<node X="52781" Y="73455" />
<node X="52551" Y="75206" />
<node X="54933" Y="76938" />
<node X="54396" Y="79397" />
<node X="55784" Y="80902" />
<node X="55439" Y="83143" />
<node X="53122" Y="83309" />
<node X="54339" Y="85836" />
<node X="53134" Y="88170" />
<node X="49728" Y="88941" />
<node X="46450" Y="86985" />
<node X="43025" Y="88687" />
<node X="41242" Y="87297" />
<node X="42002" Y="83559" />
<node X="38737" Y="83170" />
<node X="37219" Y="81068" />
<node X="37592" Y="79682" />
<node X="39704" Y="75696" />
<node X="36919" Y="70835" />
</zone>
<zone name="fishing_timak_outpost" type="FishingZone" shape="NPoly" minZ="-3800" maxZ="-3400">
<node X="67682" Y="74746" />
<node X="65873" Y="75643" />
<node X="65608" Y="85213" />
<node X="66036" Y="90979" />
<node X="68309" Y="93296" />
<node X="71879" Y="93933" />
<node X="73345" Y="92695" />
<node X="68396" Y="89707" />
<node X="67808" Y="84939" />
<node X="68325" Y="76543" />
</zone>
<zone name="fishing_heine_1" type="FishingZone" shape="NPoly" minZ="-3650" maxZ="-3550">
<node X="112721" Y="224319" />
<node X="112726" Y="225389" />
<node X="110020" Y="225385" />
<node X="110046" Y="224315" />
<node X="109772" Y="224294" />
<node X="109653" Y="226065" />
<node X="113278" Y="226285" />
<node X="113062" Y="224240" />
</zone> </zone>
</list> </list>

4
L2J_Mobius_Underground/java/com/l2jmobius/Config.java
View File

@@ -457,7 +457,7 @@ public final class Config
public static boolean ALLOW_RACE; public static boolean ALLOW_RACE;
public static boolean ALLOW_WATER; public static boolean ALLOW_WATER;
public static boolean ALLOW_RENTPET; public static boolean ALLOW_RENTPET;
public static boolean ALLOWFISHING; public static boolean ALLOW_FISHING;
public static boolean ALLOW_BOAT; public static boolean ALLOW_BOAT;
public static int BOAT_BROADCAST_RADIUS; public static int BOAT_BROADCAST_RADIUS;
public static boolean ALLOW_CURSED_WEAPONS; public static boolean ALLOW_CURSED_WEAPONS;
@@ -1674,7 +1674,7 @@ public final class Config
ALLOW_RACE = General.getBoolean("AllowRace", true); ALLOW_RACE = General.getBoolean("AllowRace", true);
ALLOW_WATER = General.getBoolean("AllowWater", true); ALLOW_WATER = General.getBoolean("AllowWater", true);
ALLOW_RENTPET = General.getBoolean("AllowRentPet", false); ALLOW_RENTPET = General.getBoolean("AllowRentPet", false);
ALLOWFISHING = General.getBoolean("AllowFishing", true); ALLOW_FISHING = General.getBoolean("AllowFishing", true);
ALLOW_MANOR = General.getBoolean("AllowManor", true); ALLOW_MANOR = General.getBoolean("AllowManor", true);
ALLOW_BOAT = General.getBoolean("AllowBoat", true); ALLOW_BOAT = General.getBoolean("AllowBoat", true);
BOAT_BROADCAST_RADIUS = General.getInt("BoatBroadcastRadius", 20000); BOAT_BROADCAST_RADIUS = General.getInt("BoatBroadcastRadius", 20000);

81
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/Fishing.java
View File

@@ -75,6 +75,10 @@ public class Fishing
public boolean isAtValidLocation() public boolean isAtValidLocation()
{ {
// TODO: implement checking direction // TODO: implement checking direction
// if (calculateBaitLocation() == null)
// {
// return false;
// }
return _player.isInsideZone(ZoneId.FISHING); return _player.isInsideZone(ZoneId.FISHING);
} }
@@ -116,7 +120,7 @@ public class Fishing
private void castLine() private void castLine()
{ {
if (!Config.ALLOWFISHING && !_player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) if (!Config.ALLOW_FISHING && !_player.canOverrideCond(PcCondOverride.ZONE_CONDITIONS))
{ {
_player.sendMessage("Fishing is disabled."); _player.sendMessage("Fishing is disabled.");
_player.sendPacket(ActionFailed.STATIC_PACKET); _player.sendPacket(ActionFailed.STATIC_PACKET);
@@ -196,11 +200,11 @@ public class Fishing
} }
_baitLocation = calculateBaitLocation(); _baitLocation = calculateBaitLocation();
if (!isAtValidLocation() || (_baitLocation == null)) if (!_player.isInsideZone(ZoneId.FISHING) || (_baitLocation == null))
{ {
if (isFishing()) if (isFishing())
{ {
_player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED); // _player.sendPacket(SystemMessageId.YOUR_ATTEMPT_AT_FISHING_HAS_BEEN_CANCELLED);
_player.sendPacket(ActionFailed.STATIC_PACKET); _player.sendPacket(ActionFailed.STATIC_PACKET);
} }
else else
@@ -362,22 +366,23 @@ public class Fishing
int baitX = (int) (_player.getX() + (cos * distance)); int baitX = (int) (_player.getX() + (cos * distance));
int baitY = (int) (_player.getY() + (sin * distance)); int baitY = (int) (_player.getY() + (sin * distance));
// search for fishing and water zone // search for fishing zone
L2FishingZone fishingZone = null; L2FishingZone fishingZone = null;
L2WaterZone waterZone = null; for (L2ZoneType zone : ZoneManager.getInstance().getZones(_player))
for (L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY))
{ {
if (zone instanceof L2FishingZone) if (zone instanceof L2FishingZone)
{ {
fishingZone = (L2FishingZone) zone; fishingZone = (L2FishingZone) zone;
break;
} }
else if (zone instanceof L2WaterZone) }
// search for water zone
L2WaterZone waterZone = null;
for (L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY))
{
if (zone instanceof L2WaterZone)
{ {
waterZone = (L2WaterZone) zone; waterZone = (L2WaterZone) zone;
}
if ((fishingZone != null) && (waterZone != null))
{
break; break;
} }
} }
@@ -385,50 +390,8 @@ public class Fishing
int baitZ = computeBaitZ(_player, baitX, baitY, fishingZone, waterZone); int baitZ = computeBaitZ(_player, baitX, baitY, fishingZone, waterZone);
if (baitZ == Integer.MIN_VALUE) if (baitZ == Integer.MIN_VALUE)
{ {
for (distance = distMax; distance >= distMin; --distance) _player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
{ return null;
baitX = (int) (_player.getX() + (cos * distance));
baitY = (int) (_player.getY() + (sin * distance));
// search for fishing and water zone again
fishingZone = null;
waterZone = null;
for (L2ZoneType zone : ZoneManager.getInstance().getZones(baitX, baitY))
{
if (zone instanceof L2FishingZone)
{
fishingZone = (L2FishingZone) zone;
}
else if (zone instanceof L2WaterZone)
{
waterZone = (L2WaterZone) zone;
}
if ((fishingZone != null) && (waterZone != null))
{
break;
}
}
baitZ = computeBaitZ(_player, baitX, baitY, fishingZone, waterZone);
if (baitZ != Integer.MIN_VALUE)
{
break;
}
}
if (baitZ == Integer.MIN_VALUE)
{
if (_player.isGM())
{
baitZ = _player.getZ();
}
else
{
_player.sendPacket(SystemMessageId.YOU_CAN_T_FISH_HERE);
return null;
}
}
} }
return new Location(baitX, baitY, baitZ); return new Location(baitX, baitY, baitZ);
@@ -458,10 +421,10 @@ public class Fishing
// always use water zone, fishing zone high z is high in the air... // always use water zone, fishing zone high z is high in the air...
final int baitZ = waterZone.getWaterZ(); final int baitZ = waterZone.getWaterZ();
if (!GeoData.getInstance().canSeeTarget(player.getX(), player.getY(), player.getZ(), baitX, baitY, baitZ)) // if (!GeoData.getInstance().canSeeTarget(player.getX(), player.getY(), player.getZ(), baitX, baitY, baitZ))
{ //
return Integer.MIN_VALUE; // return Integer.MIN_VALUE;
} // }
if (GeoData.getInstance().hasGeo(baitX, baitY)) if (GeoData.getInstance().hasGeo(baitX, baitY))
{ {

1
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -214,7 +214,6 @@ public abstract class Inventory extends ItemContainer
else if (item.getItemType() == WeaponType.FISHINGROD) else if (item.getItemType() == WeaponType.FISHINGROD)
{ {
final L2ItemInstance lure = inventory.getPaperdollItem(PAPERDOLL_LHAND); final L2ItemInstance lure = inventory.getPaperdollItem(PAPERDOLL_LHAND);
if (lure != null) if (lure != null)
{ {
inventory.setPaperdollItem(PAPERDOLL_LHAND, null); inventory.setPaperdollItem(PAPERDOLL_LHAND, null);

4
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/type/L2FishingZone.java
View File

@@ -44,7 +44,7 @@ public class L2FishingZone extends L2ZoneType
{ {
if (character.isPlayer()) if (character.isPlayer())
{ {
if ((Config.ALLOWFISHING || character.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) && !character.isInsideZone(ZoneId.FISHING)) if ((Config.ALLOW_FISHING || character.canOverrideCond(PcCondOverride.ZONE_CONDITIONS)) && !character.isInsideZone(ZoneId.FISHING))
{ {
final WeakReference<L2PcInstance> weakPlayer = new WeakReference<>(character.getActingPlayer()); final WeakReference<L2PcInstance> weakPlayer = new WeakReference<>(character.getActingPlayer());
ThreadPoolManager.getInstance().executeGeneral(new Runnable() ThreadPoolManager.getInstance().executeGeneral(new Runnable()
@@ -69,7 +69,7 @@ public class L2FishingZone extends L2ZoneType
player.sendPacket(ExAutoFishAvailable.NO); player.sendPacket(ExAutoFishAvailable.NO);
} }
} }
ThreadPoolManager.getInstance().scheduleGeneral(this, 7000); ThreadPoolManager.getInstance().scheduleGeneral(this, 1500);
} }
else else
{ {