Merge pull request #857 from Kyleeld/MES-fixes

menuentryswapper: various fixes
This commit is contained in:
Tyler Bochard
2019-07-02 18:58:16 -04:00
committed by GitHub
2 changed files with 17 additions and 5 deletions

View File

@@ -1671,7 +1671,8 @@ default CharterOption charterOption()
keyName = "removeFreezePlayerToB", keyName = "removeFreezePlayerToB",
name = "Remove freeze in ToB", name = "Remove freeze in ToB",
description = "Removes the freeze option for ice barrage, ice blitz, entangle etc. in ToB", description = "Removes the freeze option for ice barrage, ice blitz, entangle etc. in ToB",
position = 0 position = 0,
group = "PVM"
) )
default boolean getRemoveFreezePlayerToB() default boolean getRemoveFreezePlayerToB()
@@ -1683,7 +1684,8 @@ default CharterOption charterOption()
keyName = "removeFreezePlayerCoX", keyName = "removeFreezePlayerCoX",
name = "Remove freeze in CoX", name = "Remove freeze in CoX",
description = "Removes the freeze option for ice barrage, ice blitz, entangle etc. in CoX", description = "Removes the freeze option for ice barrage, ice blitz, entangle etc. in CoX",
position = 1 position = 1,
group = "PVM"
) )
default boolean getRemoveFreezePlayerCoX() default boolean getRemoveFreezePlayerCoX()

View File

@@ -1044,10 +1044,21 @@ public class MenuEntrySwapperPlugin extends Plugin
swap(client, "stun", option, target, true); swap(client, "stun", option, target, true);
} }
else if (config.swapTravel() && (option.equals("pass") || option.equals("open"))) else if (config.swapTravel() && option.equals("pass") && target.equals("energy barrier"))
{ {
swap(client, "pay-toll", option, target, false); 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);
}
else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor")) else if (config.swapTravel() && option.equals("inspect") && target.equals("trapdoor"))
{ {
swap(client, "travel", option, target, true); swap(client, "travel", option, target, true);
@@ -1160,7 +1171,6 @@ public class MenuEntrySwapperPlugin extends Plugin
else if (config.swapQuick() && option.equals("pass")) else if (config.swapQuick() && option.equals("pass"))
{ {
swap(client, "quick-pass", option, target, true); swap(client, "quick-pass", option, target, true);
swap(client, "quick pass", option, target, true);
} }
else if (config.swapQuick() && option.equals("open")) else if (config.swapQuick() && option.equals("open"))