Fishing rework and additions.
Contributed by CostyKiller.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./xsd/Fishing.xsd">
|
||||
<baitDistance min="90" max="250" />
|
||||
<xpRate min="1" max="1" /> <!-- XP modifiction rate -->
|
||||
<spRate min="1" max="1" /> <!-- SP modifiction rate -->
|
||||
<xpRate min="1" max="1" /> <!-- XP modification rate -->
|
||||
<spRate min="1" max="1" /> <!-- SP modification rate -->
|
||||
<baits>
|
||||
<bait itemId="46737" minPlayerLevel="95" chance="40" timeMin="105000" waitMin="15000"> <!-- Practice Bait -->
|
||||
<catch itemId="46736" chance="70" multiplier="1" /> <!-- Practice Fish -->
|
||||
@@ -41,7 +41,7 @@
|
||||
<catch itemId="47550" chance="70" multiplier="1" /> <!-- Ugly Fish -->
|
||||
<catch itemId="47551" chance="25" multiplier="1" /> <!-- Nimble Fish -->
|
||||
<catch itemId="47552" chance="3" multiplier="1" /> <!-- Powerful Fish -->
|
||||
<catch itemId="47554" chance="2" multiplier="1" /> <!-- Purplish Box -->
|
||||
<catch itemId="47555" chance="2" multiplier="1" /> <!-- Purplish Box -->
|
||||
</bait>
|
||||
</baits>
|
||||
<rods>
|
||||
@@ -49,14 +49,15 @@
|
||||
<rod itemId="45494" /> <!-- Sturdy Fishing Rod -->
|
||||
<rod itemId="46738" /> <!-- Practice Fishing Rod -->
|
||||
<rod itemId="46740" /> <!-- Reward Fishing Rod - 7-day -->
|
||||
<rod itemId="27632" reduceFishingTime="100" xpMultiplier="1.5" spMultiplier="1.5" /> <!-- Fancy Fishing Rod -->
|
||||
<rod itemId="27633" reduceFishingTime="100" xpMultiplier="1.5" spMultiplier="1.5" /> <!-- Fancy Fishing Rod - 1-day -->
|
||||
<rod itemId="27635" reduceFishingTime="100" xpMultiplier="1.5" spMultiplier="1.5" /> <!-- Fancy Fishing Rod - 7-day -->
|
||||
<rod itemId="27637" reduceFishingTime="100" xpMultiplier="1.5" spMultiplier="1.5" /> <!-- Fancy Fishing Rod - 30-day -->
|
||||
<rod itemId="47557" reduceFishingTime="10" /> <!-- Master Fishing Rod - Stage 1 -->
|
||||
<rod itemId="47558" reduceFishingTime="15" /> <!-- Master Fishing Rod - Stage 2 -->
|
||||
<rod itemId="47559" reduceFishingTime="20" /> <!-- Master Fishing Rod - Stage 3 -->
|
||||
<rod itemId="47560" reduceFishingTime="25" /> <!-- Master Fishing Rod - Stage 4 -->
|
||||
<rod itemId="47561" reduceFishingTime="30" /> <!-- Master Fishing Rod - Stage 5 -->
|
||||
<rod itemId="46286" reduceFishingTime="100000" xpMultiplier="2.5" spMultiplier="2.5" /> <!-- Christmas Fishing Rod -->
|
||||
<rod itemId="27632" reduceFishingTime="95000" xpMultiplier="1.5" spMultiplier="1.5" /> <!-- Fancy Fishing Rod -->
|
||||
<rod itemId="27633" reduceFishingTime="95000" xpMultiplier="1.5" spMultiplier="1.5" /> <!-- Fancy Fishing Rod - 1-day -->
|
||||
<rod itemId="27635" reduceFishingTime="95000" xpMultiplier="1.5" spMultiplier="1.5" /> <!-- Fancy Fishing Rod - 7-day -->
|
||||
<rod itemId="27637" reduceFishingTime="95000" xpMultiplier="1.5" spMultiplier="1.5" /> <!-- Fancy Fishing Rod - 30-day -->
|
||||
<rod itemId="47557" reduceFishingTime="10000" /> <!-- Master Fishing Rod - Stage 1 -->
|
||||
<rod itemId="47558" reduceFishingTime="15000" /> <!-- Master Fishing Rod - Stage 2 -->
|
||||
<rod itemId="47559" reduceFishingTime="20000" /> <!-- Master Fishing Rod - Stage 3 -->
|
||||
<rod itemId="47560" reduceFishingTime="25000" /> <!-- Master Fishing Rod - Stage 4 -->
|
||||
<rod itemId="47561" reduceFishingTime="30000" /> <!-- Master Fishing Rod - Stage 5 -->
|
||||
</rods>
|
||||
</list>
|
@@ -55,7 +55,7 @@ public class FishShots implements IItemHandler
|
||||
return false;
|
||||
}
|
||||
|
||||
if (player.isChargedShot(ShotType.FISH_SOULSHOTS))
|
||||
if (player.isChargedShot(ShotType.FISH_SOULSHOTS) || player.isChargedShot(ShotType.GOLD_FISH_SOULSHOTS))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -73,7 +73,15 @@ public class FishShots implements IItemHandler
|
||||
return false;
|
||||
}
|
||||
|
||||
player.chargeShot(ShotType.FISH_SOULSHOTS);
|
||||
if (item.getId() == 29186) // Gold Fish Shot
|
||||
{
|
||||
player.chargeShot(ShotType.GOLD_FISH_SOULSHOTS);
|
||||
}
|
||||
else
|
||||
{
|
||||
player.chargeShot(ShotType.FISH_SOULSHOTS);
|
||||
}
|
||||
|
||||
player.destroyItemWithoutTrace("Consume", item.getObjectId(), 1, null, false);
|
||||
final WorldObject oldTarget = player.getTarget();
|
||||
player.setTarget(player);
|
||||
|
@@ -996,8 +996,13 @@
|
||||
<set name="immediate_effect" val="true" />
|
||||
<set name="material" val="PAPER" />
|
||||
<set name="weight" val="1" />
|
||||
<set name="is_sellable" val="false" />
|
||||
<set name="price" val="500" />
|
||||
<set name="is_stackable" val="true" />
|
||||
<set name="etcitem_type" val="SOULSHOT" />
|
||||
<set name="handler" val="FishShots" />
|
||||
<skills>
|
||||
<skill id="28186" level="1" /> <!-- Gold Fishing Shot -->
|
||||
</skills>
|
||||
</item>
|
||||
<item id="29187" name="Fishing XP Box" additionalName="Lv. 85 - 94" type="EtcItem">
|
||||
<!-- Box that contains Fishing Scroll: XP (Lv. 85 to 94). There's a chance to obtain a Shining Fishing Box. -->
|
||||
|
@@ -626,18 +626,18 @@
|
||||
<item id="47554" name="Reddish Box" type="EtcItem">
|
||||
<!-- Double-click to obtain the item. -->
|
||||
<set name="icon" val="icon.etc_treasure_box_i03" />
|
||||
<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
|
||||
<set name="default_action" val="PEEL" />
|
||||
<set name="immediate_effect" val="true" />
|
||||
<set name="weight" val="10" />
|
||||
<set name="is_tradable" val="false" />
|
||||
<set name="is_dropable" val="false" />
|
||||
<set name="is_sellable" val="false" />
|
||||
<set name="is_stackable" val="true" />
|
||||
<set name="default_action" val="PEEL" />
|
||||
<set name="immediate_effect" val="true" />
|
||||
<set name="handler" val="ExtractableItems" />
|
||||
<set name="material" val="FISH" />
|
||||
<set name="extractableCountMin" val="1" />
|
||||
<set name="extractableCountMax" val="1" />
|
||||
<set name="material" val="FISH" />
|
||||
<set name="handler" val="ExtractableItems" />
|
||||
<capsuled_items>
|
||||
<item id="39720" min="1" max="1" chance="27" /> <!-- Maphr's Luck Potion -->
|
||||
<item id="45494" min="1" max="1" chance="3" /> <!-- Sturdy Fishing Rod -->
|
||||
@@ -648,13 +648,25 @@
|
||||
<item id="47555" name="Purplish Box" type="EtcItem">
|
||||
<!-- Double-click to obtain the item. -->
|
||||
<set name="icon" val="icon.etc_treasure_box_i04" />
|
||||
<set name="default_action" val="SKILL_REDUCE_ON_SKILL_SUCCESS" />
|
||||
<set name="default_action" val="PEEL" />
|
||||
<set name="immediate_effect" val="true" />
|
||||
<set name="weight" val="10" />
|
||||
<set name="is_tradable" val="false" />
|
||||
<set name="is_dropable" val="false" />
|
||||
<set name="is_sellable" val="false" />
|
||||
<set name="is_stackable" val="true" />
|
||||
<set name="material" val="FISH" />
|
||||
<set name="extractableCountMin" val="1" />
|
||||
<set name="extractableCountMax" val="1" />
|
||||
<set name="handler" val="ExtractableItems" />
|
||||
<capsuled_items>
|
||||
<item id="38154" min="50" max="50" chance="16.666666666667" /> <!-- Fishing Shot -->
|
||||
<item id="39720" min="1" max="1" chance="16.666666666667" /> <!-- Freya's Luck Potion -->
|
||||
<item id="8034" min="1" max="1" chance="16.666666666667" /> <!-- Rainbow Springs Clan Hall War Decree -->
|
||||
<item id="47556" min="1" max="1" chance="16.666666666667" /> <!-- Stardust -->
|
||||
<item id="45494" min="1" max="1" chance="16.666666666667" /> <!-- Sturdy Fishing Rod -->
|
||||
<item id="48065" min="1" max="1" chance="16.666666666667" /> <!-- Zodiac Cube Fragment -->
|
||||
</capsuled_items>
|
||||
</item>
|
||||
<item id="47556" name="Stardust" type="EtcItem">
|
||||
<!-- Ingredient needed to exchange Elementary Seed Bracelet. -->
|
||||
|
Reference in New Issue
Block a user