ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Updated menu swapper (#722)

Browse Source 
* Supersedes/Closes runelite#7353
Supersedes/Closes runelite#7415
Supersedes/Closes runelite#7493
Supersedes/Closes runelite#7401
Supersedes/Closes runelite#7151
Supersedes/Closes runelite#5383
streamline teleport item swaps

Move Mage of Zamorak teleport to Travel swap
It is a travel swap so there's no reason for it to have it's own option.

unify bank and exchange options
There's no reason for these to be separate options.

Swap Coal Bag Empty - Makes Empty the left click option when in a bank

* Update

Signed-off-by: James Munson <jmunson@openpoll.io>

* Added Trader Crew

Signed-off-by: James Munson <jmunson@openpoll.io>

* Added swap for quick enter[ToB]
Added swap Talk-to with Enchant for Eluned

Signed-off-by: James Munson <jmunson@openpoll.io>
This commit is contained in:
James
2019-06-27 14:05:52 -07:00
committed by Kyleeld
parent 64e96e644b
commit 20456e85ac
4 changed files with 297 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

428
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperConfig.java
View File

File diff suppressed because it is too large Load Diff

102
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -81,6 +81,7 @@ import net.runelite.client.plugins.menuentryswapper.util.FairyRingMode;
import net.runelite.client.plugins.menuentryswapper.util.HouseMode;
import net.runelite.client.plugins.menuentryswapper.util.ObeliskMode;
import net.runelite.client.plugins.menuentryswapper.util.OccultAltarMode;
import net.runelite.client.plugins.menuentryswapper.util.CharterOption;
import static net.runelite.client.util.MenuUtil.swap;
import net.runelite.client.util.MiscUtils;
import net.runelite.client.util.Text;
@@ -902,23 +903,19 @@ public class MenuEntrySwapperPlugin extends Plugin
if (option.equals("talk-to"))
{
if (config.swapPickpocket() && target.contains("h.a.m."))
if (config.swapPickpocket())
{
swap(client, "pickpocket", option, target, true);
}
if (config.swapAbyssTeleport() && target.contains("mage of zamorak"))
{
swap(client, "teleport", option, target, true);
}
if (config.swapHardWoodGrove() && target.contains("rionasta"))
{
swap(client, "send-parcel", option, target, true);
}
if (config.swapBank())
if (config.swapBankExchange())
{
swap(client, "bank", option, target, true);
swap(client, "exchange", option, target, true);
}
if (config.swapContract())
@@ -926,14 +923,14 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "contract", option, target, true);
}
if (config.swapExchange())
{
swap(client, "exchange", option, target, true);
}
if (config.swapDarkMage())
if (config.swapInteract())
{
swap(client, "repairs", option, target, true);
swap(client, "claim-slime", option, target, true);
swap(client, "decant", option, target, true);
swap(client, "claim", option, target, true);
swap(client, "heal", option, target, true);
swap(client, "help", option, target, true);
}
// make sure assignment swap is higher priority than trade swap for slayer masters
@@ -947,21 +944,19 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "buy-plank", option, target, true);
}
if (config.claimDynamite() && target.equals("thirus"))
{
swap(client, "claim", option, target, true);
}
if (config.swapTrade())
if (config.swapTrade() && (!(target.equals("trader crewmember") || target.equals("trader stan")) || config.charterOption().equals(CharterOption.TRADE)))
{
swap(client, "trade", option, target, true);
swap(client, "trade-with", option, target, true);
swap(client, "shop", option, target, true);
}
if (config.claimSlime() && target.equals("robin"))
if (config.swapMinigame())
{
swap(client, "claim-slime", option, target, true);
swap(client, "story", option, target, true);
swap(client, "escort", option, target, true);
swap(client, "dream", option, target, true);
swap(client, "start-minigame", option, target, true);
}
if (config.swapTravel())
@@ -976,6 +971,16 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "rellekka", option, target, true);
swap(client, "follow", option, target, true);
swap(client, "transport", option, target, true);
if (config.swapAbyssTeleport() && target.contains("mage of zamorak"))
{
swap(client, "teleport", option, target, true);
}
if (!(target.equals("trader crewmember") || target.equals("trader stan")) || config.charterOption().equals(CharterOption.CHARTER))
{
swap(client, "charter", option, target, true);
}
}
if (config.swapPay())
@@ -984,30 +989,16 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "pay (", option, target, false);
}
if (config.swapDream())
{
swap(client, "dream", option, target, true);
}
if (config.swapDecant())
{
swap(client, "decant", option, target, true);
}
if (config.swapQuick())
{
swap(client, "quick-travel", option, target, true);
}
if (config.swapStory())
if (config.swapEnchant())
{
swap(client, "story", option, target, true);
swap(client, "enchant", option, target, true);
}
if (config.swapEscort())
{
swap(client, "escort", option, target, true);
}
}
else if (config.swapWildernessLever() && target.equals("lever") && option.equals("ardougne"))
@@ -1025,18 +1016,9 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "stun", option, target, true);
}
else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier"))
else if (config.swapTravel() && (option.equals("pass") || option.equals("open")))
{
swap(client, "pay-toll(2-ecto)", option, target, true);
}
else if (config.swapTravel() && option.equals("open") && target.equals("gate"))
{
swap(client, "pay-toll(10gp)", option, target, true);
}
else if (config.swapHardWoodGrove() && option.equals("open") && target.equals("hardwood grove doors"))
{
swap(client, "quick-pay(100)", option, target, true);
swap(client, "pay-toll", option, target, false);
}
else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor"))
{
@@ -1157,7 +1139,14 @@ public class MenuEntrySwapperPlugin extends Plugin
{
swap(client, "quick-open", option, target, true);
}
else if (config.swapQuick() && option.equals("enter"))
{
swap(client, "quick-enter", option, target, true);
}
else if (config.swapQuick() && option.equals("leave tomb"))
{
swap(client, "quick-leave", option, target, true);
}
else if (config.swapAdmire() && option.equals("admire"))
{
swap(client, "teleport", option, target, true);
@@ -1202,17 +1191,14 @@ public class MenuEntrySwapperPlugin extends Plugin
}
// Put all item-related swapping after shift-click
else if (config.swapTeleportItem() && option.equals("wear"))
else if (config.swapTeleportItem() && (option.equals("wear") || option.equals("wield")))
{
swap(client, "rub", option, target, true);
swap(client, "teleport", option, target, true);
}
else if (option.equals("wield"))
else if (config.swapCoalBag() && option.contains("deposit") && target.equals("coal bag"))
{
if (config.swapTeleportItem())
{
swap(client, "teleport", option, target, true);
}
swap(client, "empty", option, target, true);
}
else if (config.swapBones() && option.equals("bury"))
{
@@ -1382,6 +1368,12 @@ public class MenuEntrySwapperPlugin extends Plugin
menuManager.addSwap("remove", "burning amulet", config.getBurningAmuletMode().toString());
}
if (config.teleEquippedCape())
{
menuManager.addSwap("remove", "tele to poh", config.telecapeMode().toString());
menuManager.addSwap("remove", "teleport", config.telecapeMode().toString());
}
if (config.getCombatBracelet())
{
menuManager.addSwap("remove", "combat bracelet", config.getCombatBraceletMode().toString());

20
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/CharterOption.java Normal file
View File

@@ -0,0 +1,20 @@
package net.runelite.client.plugins.menuentryswapper.util;
public enum CharterOption
{
TRADE("Trade"),
CHARTER("Charter");
private final String name;
CharterOption(String name)
{
this.name = name;
}
@Override
public String toString()
{
return name;
}
}

20
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/util/teleEquippedMode.java Normal file
View File

@@ -0,0 +1,20 @@
package net.runelite.client.plugins.menuentryswapper.util;
public enum teleEquippedMode
{
TELE_TO_POH("Tele to POH"),
TELEPORT("teleport");
private final String name;
teleEquippedMode(String name)
{
this.name = name;
}
@Override
public String toString()
{
return name;
}
}