Skip to content

(fix): Bring inline with plugin objectives #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Menddd wants to merge 2 commits into
base: Skill-Calc-Sailing
Choose a base branch
from
Open

(fix): Bring inline with plugin objectives #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e0c8ac
(feat): Add Sailing to SkillCalculator
Menddd Dec 1, 2025
494ae2e
(fix): Bring inline with plugin objectives
Menddd Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...lite-client/src/main/java/net/runelite/client/plugins/skillcalculator/CalculatorType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ enum CalculatorType
RUNECRAFT(Skill.RUNECRAFT, RunecraftBonus.values(), RunecraftAction.values()),
FARMING(Skill.FARMING, FarmingBonus.values(), FarmingAction.values()),
CONSTRUCTION(Skill.CONSTRUCTION, ConstructionBonus.values(), ConstructionAction.values()),
HUNTER(Skill.HUNTER, null, HunterAction.values());
HUNTER(Skill.HUNTER, null, HunterAction.values()),
SAILING(Skill.SAILING, null, SailingAction.values());

private final Skill skill;
@Nullable
Expand Down
2 changes: 2 additions & 0 deletions ...ite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,8 @@ public void focusLost(FocusEvent e)
return VarPlayerID.XPDROPS_CRAFTING_END;
case SMITHING:
return VarPlayerID.XPDROPS_SMITHING_END;
case SAILING:
return VarPlayerID.XPDROPS_SAILING_END;
case THIEVING:
return VarPlayerID.XPDROPS_THIEVING_END;
case FLETCHING:
Expand Down
64 changes: 64 additions & 0 deletions ...lient/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SailingAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
package net.runelite.client.plugins.skillcalculator.skills;

import lombok.AllArgsConstructor;
import lombok.Getter;
import net.runelite.api.gameval.ItemID;
import net.runelite.client.game.ItemManager;

@AllArgsConstructor
@Getter
public enum SailingAction implements NamedSkillAction
{
SMALL_SHIPWRECK_SORTING("Small Shipwreck Salvage (Sorting)", 15, 5, ItemID.SAILING_SMALL_SHIPWRECK_SALVAGE),
SMALL_SHIPWRECK_SALVAGE("Small Shipwreck Salvage (Salvaging)", 15, 10, ItemID.SAILING_SMALL_SHIPWRECK_SALVAGE),
FISHY_SHIPWRECK_SORTING("Fishy Shipwreck Salvage (Sorting)", 26, 9, ItemID.SAILING_FISHERMAN_SHIPWRECK_SALVAGE),
FISHY_SHIPWRECK_SALVAGE("Fishy Shipwreck Salvage (Salvaging)", 26, 17, ItemID.SAILING_FISHERMAN_SHIPWRECK_SALVAGE),
TEMPEST_TRIAL_UNRANKED("Unranked Tempor Trial", 30, 300, ItemID.RALPHS_FABRIC_ROLL),
TEMPEST_TRIAL_SWORDFISH("Swordfish Tempor Trial", 30, 595, ItemID.RALPHS_FABRIC_ROLL),
TEMPEST_TRIAL_SHARK("Shark Tempor Trial", 30, 1025, ItemID.RALPHS_FABRIC_ROLL),
TEMPEST_TRIAL_MARLIN("Marlin Tempor Trial", 30, 1790, ItemID.RALPHS_FABRIC_ROLL),
TEST_BOUNTY_30("Level 30 Bounty", 30, 1790, ItemID.SAILING_BULL_SHARK_JAW),
BARRACUDA_SHIPWRECK_SORTING("Barracuda Shipwreck Salvage (Sorting)", 35, 15.5f, ItemID.SAILING_BARRACUDA_SHIPWRECK_SALVAGE),
BARRACUDA_SHIPWRECK_SALVAGE("Barracuda Shipwreck Salvage (Salvaging)", 35, 31, ItemID.SAILING_BARRACUDA_SHIPWRECK_SALVAGE),
BOUNTY_38("Level 38 Bounty", 38, 2020, ItemID.SAILING_BULL_SHARK_JAW),
BOUNTY_40("Level 40 Bounty", 40, 3400, ItemID.SAILING_BULL_SHARK_JAW),
BOUNTY_45_48("Level 45-48 Bounty", 45, 3650, ItemID.SAILING_BULL_SHARK_JAW),
BOUNTY_50("Level 50 Bounty", 50, 4390, ItemID.SAILING_BULL_SHARK_JAW),
LARGE_SHIPWRECK_SORTING("Large Shipwreck Salvage (Sorting)", 53, 24, ItemID.SAILING_LARGE_SHIPWRECK_SALVAGE),
LARGE_SHIPWRECK_SALVAGE("Large Shipwreck Salvage (Salvaging)", 53, 48, ItemID.SAILING_LARGE_SHIPWRECK_SALVAGE),
JIVE_TRIAL_UNRANKED("Unranked Jubbly Jive Trial", 55, 1400, ItemID.GURTOBS_FABRIC_ROLL),
JIVE_TRIAL_SWORDFISH("Swordfish Jubbly Jive Trial", 55, 2200, ItemID.GURTOBS_FABRIC_ROLL),
JIVE_TRIAL_SHARK("Shark Jubbly Jive Trial", 55, 3950, ItemID.GURTOBS_FABRIC_ROLL),
JEST_BOUNTY_55("Level 50 Bounty", 55, 6360, ItemID.SAILING_BULL_SHARK_JAW),
JIVE_TRIAL_MARLIN("Marlin Jubbly Jive Trial", 55, 7500, ItemID.GURTOBS_FABRIC_ROLL),
BOUNTY_60_62("Level 60-62 Bounty", 60, 6760, ItemID.SAILING_BULL_SHARK_JAW),
PLUNDERED_SHIPWRECK_SORTING("Plundered Shipwreck Salvage (Sorting)", 64, 31.5f, ItemID.SAILING_PIRATE_SHIPWRECK_SALVAGE),
PLUNDERED_SHIPWRECK_SALVAGE("Plundered Shipwreck Salvage (Salvaging)", 64, 63, ItemID.SAILING_PIRATE_SHIPWRECK_SALVAGE),
BOUNTY_65_67("Level 65-67 Bounty", 65, 7500, ItemID.SAILING_BULL_SHARK_JAW),
BOUNTY_70("Level 70 Bounty", 70, 7730, ItemID.SAILING_BULL_SHARK_JAW),
GLIDE_TRIAL_UNRANKED("Unranked Gwenith Glide Trial", 72,3100, ItemID.GWYNAS_FABRIC_ROLL),
GLIDE_TRIAL_SWORDFISH("Swordfish Gwenith Glide Trial", 72,4100, ItemID.GWYNAS_FABRIC_ROLL),
GLIDE_TRIAL_SHARK("Shark Gwenith Glide Trial", 72, 9315, ItemID.GWYNAS_FABRIC_ROLL),
GLIDE_TRIAL_MARLIN("Marlin Gwenith Glide Trial", 72, 18160, ItemID.GWYNAS_FABRIC_ROLL),
MARTIAL_SHIPWRECK_SORTING("Martial Shipwreck Salvage (Sorting)", 73, 63.5f, ItemID.SAILING_MERCENARY_SHIPWRECK_SALVAGE),
MARTIAL_SHIPWRECK_SALVAGE("Martial Shipwreck Salvage (Salvaging)", 73, 127, ItemID.SAILING_MERCENARY_SHIPWRECK_SALVAGE),
BOUNTY_75_76("Level 75-76 Bounty", 75, 8540, ItemID.SAILING_BULL_SHARK_JAW),
FREMENNIK_SHIPWRECK_SORTING("Fremennik Shipwreck Salvage (Sorting)", 80, 75, ItemID.SAILING_FREMENNIK_SHIPWRECK_SALVAGE),
FREMENNIK_SHIPWRECK_SALVAGE("Fremennik Shipwreck Salvage (Salvaging)", 80, 150, ItemID.SAILING_FREMENNIK_SHIPWRECK_SALVAGE),
ARMOURED_KRAKEN_BOUNTY("Level 80 Bounty", 80, 9540, ItemID.SAILING_BULL_SHARK_JAW),
OPULENT_SHIPWRECK_SORTING("Opulent Shipwreck Salvage (Sorting)", 87, 95, ItemID.SAILING_MERCHANT_SHIPWRECK_SALVAGE),
OPULENT_SHIPWRECK_SALVAGE("Opulent Shipwreck Salvage (Salvaging)", 87, 190, ItemID.SAILING_MERCHANT_SHIPWRECK_SALVAGE),

;

private final String name;
private final int level;
private final float xp;
private final int icon;

@Override
public boolean isMembers(final ItemManager itemManager)
{
return true;
}
}
39 changes: 39 additions & 0 deletions ...client/src/main/java/net/runelite/client/plugins/skillcalculator/skills/SailingBonus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Copyright (c) 2021, Jordan Atwood <nightfirecat@protonmail.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.skillcalculator.skills;

import lombok.AllArgsConstructor;
import lombok.Getter;

@AllArgsConstructor
@Getter(onMethod_ = @Override)
public enum SailingBonus implements SkillBonus
{
HORIZONS_LURE("Horizon's Lure", 1.025f),
;

private final String name;
private final float value;
}
Loading