powerskiller: sandstone mining support. Updated config and added constants.

quickeater: support for additional prayer potions
This commit is contained in:
illumineawake 2020-09-08 09:23:28 +10:00
parent d5323840d7
commit b04d29834b
11 changed files with 21 additions and 28 deletions

View File

@ -1 +1 @@
[{"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"BotUtils","description":"Illumine - Utils required for plugins to function with added automation","id":"botutils-plugin","releases":[{"date":"2020-09-08","sha512sum":"0EED0D42906761DC77226DE8FE940EBAB1669E2CEFD9EA1C453C16D0B981B350138B535DED3967BBDF52AE3DD06F844D00E5A8175F51A929716755FA2E05D368","version":"3.9.3","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/botutils-3.9.3.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Combination Runecrafter Plugin","description":"Illumine - Combination Runecrafting plugin","id":"combinationrunecrafterplugin-plugin","releases":[{"date":"2020-09-08","sha512sum":"B8A719E9F9E965884697892F29BC9D879F0A9D2464B0B678618F80E05A6940F52386255B15661EBEEC81127D6CA3EE7BDEE2AD11284E9059EC1AD3F8F7E11307","version":"1.7.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/combinationrunecrafter-1.7.1.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Magic Splasher","description":"Illumine automated magic splasher","id":"magicsplasher-plugin","releases":[{"date":"2020-09-08","sha512sum":"373B0B2969539F590C874F1102DA0DDB7D8B549626A93150B98A926015DB1FF3E645D10656537BB4C9697EE1AA3FE8E9A2140EF104F782C0B192DE10A2F1816F","version":"2.6.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/magicsplasher-2.6.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Menu Debugger Plugin","description":"Illumine - Menu Debugger plugin","id":"menudebuggerplugin-plugin","releases":[{"date":"2020-09-08","sha512sum":"E56679CE2553D735F8C6D09D07CBB81765E93718A877F4FD4BFDFE728067F63400AADC7504F3160F437BA061C3499A36B679E634CD241FE05C9F6673585C66ED","version":"0.0.2","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/menudebugger-0.0.2.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Powerfighter Plugin","description":"Illumine - Powerfighter plugin","id":"powerfighterplugin-plugin","releases":[{"date":"2020-09-08","sha512sum":"B4D2A6C5FD9DEDC01A5405720272FEF118F028CD92F81459AFA15B7D3BB23FB55F8B13D9D85CD31ACAFC6836FF854E90A0B320EBD9EE753E4E8442838DD4602E","version":"1.5.3","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/powerfighter-1.5.3.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Power Skiller","description":"Illumine auto power skiller plugin","id":"powerskiller-plugin","releases":[{"date":"2020-09-08","sha512sum":"54000ABF33229467B8AD6BFDE7A3526C87790C3C8684A29CA207A965E57D70CEBCF2C3E393951F4CE82BE7EA447D6329CC5750C6C906A6E0F99FAA8DD2BA9309","version":"4.3.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/powerskiller-4.3.1.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Quick Eater","description":"Illumine - auto eat food below configured HP","id":"quickeater-plugin","releases":[{"date":"2020-09-08","sha512sum":"8608BDC3DA5840AB1A0655F8D54CB3EECB5DAAE08F830FC27BFB382C138105E622D9798698B3A86E08AF53F458930561A992BC69D6EC76B06C596D46527BCB06","version":"2.8.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/quickeater-2.8.1.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Random Handler","description":"illumine - Dismiss random events and handle genie","id":"randomhandler-plugin","releases":[{"date":"2020-09-08","sha512sum":"C3FA5D53ECBCD27EF7B5114B08B87D5BF571C455C28501D03B1B1D20CF62EBB5BBDCACFCAC9CAE5A0F8EE1725B790A44E0F507069222F4DCDC253D795DA3DA0A","version":"1.0.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/randomhandler-1.0.1.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Rooftop Agility","description":"Illumine automated rooftop agility plugin","id":"rooftopagility-plugin","releases":[{"date":"2020-09-08","sha512sum":"9290A8B0DDA692D67FEADC31AA2C363A4AFE72BDCFCC221D0D8DB3BC7CBE26650B74B994369A2154AF1BDE445E3ACEE7B36837B263A927934B7FF40E5B532528","version":"3.7.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/rooftopagility-3.7.1.jar?raw=true","requires":"0.0.1"}]}]
[{"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"BotUtils","description":"Illumine - Utils required for plugins to function with added automation","id":"botutils-plugin","releases":[{"date":"2020-09-08","sha512sum":"0EED0D42906761DC77226DE8FE940EBAB1669E2CEFD9EA1C453C16D0B981B350138B535DED3967BBDF52AE3DD06F844D00E5A8175F51A929716755FA2E05D368","version":"3.9.3","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/botutils-3.9.3.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Combination Runecrafter Plugin","description":"Illumine - Combination Runecrafting plugin","id":"combinationrunecrafterplugin-plugin","releases":[{"date":"2020-09-08","sha512sum":"B8A719E9F9E965884697892F29BC9D879F0A9D2464B0B678618F80E05A6940F52386255B15661EBEEC81127D6CA3EE7BDEE2AD11284E9059EC1AD3F8F7E11307","version":"1.7.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/combinationrunecrafter-1.7.1.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Magic Splasher","description":"Illumine automated magic splasher","id":"magicsplasher-plugin","releases":[{"date":"2020-09-08","sha512sum":"373B0B2969539F590C874F1102DA0DDB7D8B549626A93150B98A926015DB1FF3E645D10656537BB4C9697EE1AA3FE8E9A2140EF104F782C0B192DE10A2F1816F","version":"2.6.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/magicsplasher-2.6.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Menu Debugger Plugin","description":"Illumine - Menu Debugger plugin","id":"menudebuggerplugin-plugin","releases":[{"date":"2020-09-08","sha512sum":"E56679CE2553D735F8C6D09D07CBB81765E93718A877F4FD4BFDFE728067F63400AADC7504F3160F437BA061C3499A36B679E634CD241FE05C9F6673585C66ED","version":"0.0.2","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/menudebugger-0.0.2.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Powerfighter Plugin","description":"Illumine - Powerfighter plugin","id":"powerfighterplugin-plugin","releases":[{"date":"2020-09-08","sha512sum":"B4D2A6C5FD9DEDC01A5405720272FEF118F028CD92F81459AFA15B7D3BB23FB55F8B13D9D85CD31ACAFC6836FF854E90A0B320EBD9EE753E4E8442838DD4602E","version":"1.5.3","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/powerfighter-1.5.3.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Power Skiller","description":"Illumine auto power skiller plugin","id":"powerskiller-plugin","releases":[{"date":"2020-09-08","sha512sum":"1F56E9966FF6531FB614F8268259320555F474CEDCBF4C68A2991292AD0227776330E5DA008D913F20C36DD485023D4D339DFFB0A6939CFD812073E3DB31711C","version":"4.4.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/powerskiller-4.4.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Quick Eater","description":"Illumine - auto eat food below configured HP","id":"quickeater-plugin","releases":[{"date":"2020-09-08","sha512sum":"6F24296D81EB07645A61CCD43FE96CF8EF37B580967BF83A2D694C25A77978ECA8A51B1494CE54A1A39C309B916BF12E7F65655F753B07A538FCFA1A3C09AF56","version":"2.9.0","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/quickeater-2.9.0.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Random Handler","description":"illumine - Dismiss random events and handle genie","id":"randomhandler-plugin","releases":[{"date":"2020-09-08","sha512sum":"C3FA5D53ECBCD27EF7B5114B08B87D5BF571C455C28501D03B1B1D20CF62EBB5BBDCACFCAC9CAE5A0F8EE1725B790A44E0F507069222F4DCDC253D795DA3DA0A","version":"1.0.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/randomhandler-1.0.1.jar?raw=true","requires":"0.0.1"}]}, {"projectUrl":"https://discord.gg/9fGzEDR","provider":"illumine","name":"Rooftop Agility","description":"Illumine automated rooftop agility plugin","id":"rooftopagility-plugin","releases":[{"date":"2020-09-08","sha512sum":"9290A8B0DDA692D67FEADC31AA2C363A4AFE72BDCFCC221D0D8DB3BC7CBE26650B74B994369A2154AF1BDE445E3ACEE7B36837B263A927934B7FF40E5B532528","version":"3.7.1","url":"https://github.com/illumineawake/illu-plugins/blob/master/release/rooftopagility-3.7.1.jar?raw=true","requires":"0.0.1"}]}]

View File

@ -23,7 +23,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
version = "4.3.1"
version = "4.4.0"
project.extra["PluginName"] = "Power Skiller"
project.extra["PluginDescription"] = "Illumine auto power skiller plugin"

View File

@ -503,18 +503,6 @@ public interface PowerSkillerConfiguration extends Config
return false;
}
@ConfigItem(
keyName = "depositGrinder",
name = "Deposit Grinder",
description = "Deposit in Grinder",
position = 122,
titleSection = "dropTitle"
)
default boolean depositGrinder()
{
return false;
}
@Range(
min = 1,
max = 60

View File

@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client;
import net.runelite.api.Perspective;
import static net.runelite.api.MenuOpcode.RUNELITE_OVERLAY_CONFIG;
import net.runelite.api.coords.LocalPoint;
import static net.runelite.client.ui.overlay.OverlayManager.OPTION_CONFIGURE;
import net.runelite.client.ui.overlay.OverlayMenuEntry;
import net.runelite.client.ui.overlay.OverlayPanel;
@ -56,7 +57,7 @@ class PowerSkillerOverlay extends OverlayPanel
{
try
{
OverlayUtil.renderPolygon(graphics, Perspective.getCanvasTileAreaPoly(client, client.getLocalPlayer().getLocalLocation(),config.locationRadius()), ColorUtil.fromHex("#121212"));
OverlayUtil.renderPolygon(graphics, Perspective.getCanvasTileAreaPoly(client, LocalPoint.fromWorld(client, plugin.skillLocation) /* client.getLocalPlayer().getLocalLocation()*/,config.locationRadius()), ColorUtil.fromHex("#121212"));
} catch (Exception ignored) {
//Perspective can not find the Polygon to draw on the map.
}

View File

@ -40,6 +40,7 @@ import net.runelite.api.GameObject;
import net.runelite.api.MenuEntry;
import net.runelite.api.NPC;
import net.runelite.api.NullObjectID;
import net.runelite.api.ObjectID;
import net.runelite.api.Player;
import net.runelite.api.GameState;
import net.runelite.api.MenuOpcode;
@ -113,6 +114,9 @@ public class PowerSkillerPlugin extends Plugin
Player player;
Rectangle altRect = new Rectangle(-100,-100, 10, 10);
WorldArea DENSE_ESSENCE_AREA = new WorldArea(new WorldPoint(1754, 3845, 0), new WorldPoint(1770, 3862, 0));
private final WorldPoint WEST_ROCK = new WorldPoint(3164, 2914, 0);
private final WorldPoint SW_ROCK = new WorldPoint(3166, 2913, 0);
private final WorldPoint SE_ROCK = new WorldPoint(3167, 2913, 0);
int timeout = 0;
int opcode;
@ -375,7 +379,7 @@ public class PowerSkillerPlugin extends Plugin
{
return HANDLE_BREAK;
}
if(config.depositGrinder()){
if(config.type() == PowerSkillerType.SANDSTONE){
if(utils.inventoryFull()){
return ADDING_SANDSTONE_TO_GRINDER;
} else if (player.getWorldLocation().equals(new WorldPoint(3152,2910,0))) {
@ -450,10 +454,10 @@ public class PowerSkillerPlugin extends Plugin
break;
case ADDING_SANDSTONE_TO_GRINDER:
objectIds.clear();
objectIds.add(26199); //grinder id
objectIds.add(ObjectID.GRINDER);
interactSandstoneObject();
objectIds.clear();
objectIds.add(11386); //sandstone id
objectIds.add(ObjectID.ROCKS_11386); //sandstone id
timeout=tickDelay();
return;
case WALKING_BACK_TO_SANDSTONE:
@ -503,7 +507,7 @@ public class PowerSkillerPlugin extends Plugin
timeout = tickDelay();
break;
case FIND_GAME_OBJECT:
if(config.depositGrinder()){
if(config.type() == PowerSkillerType.SANDSTONE){
interactSandstoneObject();
timeout = tickDelay();
return;
@ -608,7 +612,7 @@ public class PowerSkillerPlugin extends Plugin
{
return;
}
if(config.depositGrinder()){
if(config.type() == PowerSkillerType.SANDSTONE){
return;
}
if (config.dropInventory())
@ -649,25 +653,24 @@ public class PowerSkillerPlugin extends Plugin
//a custom function that looks for a grinder outside of the players usual location radius
//it also only interacts with the three most efficient sandstone rocks
log.info(objectIds.toString());
if(!objectIds.contains(26199)){ //if not looking for the grinder
if(!objectIds.contains(ObjectID.GRINDER)){ //if not looking for the grinder
//look for sandstone in the radius set by the player
for(GameObject gameObject : utils.getGameObjects(11386)){
if(gameObject.getWorldLocation().equals(new WorldPoint(3164, 2914, 0))){
for(GameObject gameObject : utils.getGameObjects(ObjectID.ROCKS_11386)){
if(gameObject.getWorldLocation().equals(WEST_ROCK)){
targetObject=gameObject; //west rock
break;
} else if(gameObject.getWorldLocation().equals(new WorldPoint(3166, 2913, 0))){
} else if(gameObject.getWorldLocation().equals(SW_ROCK)){
targetObject=gameObject; //south west rock
break;
} else if(gameObject.getWorldLocation().equals(new WorldPoint(3167, 2913, 0))){
} else if(gameObject.getWorldLocation().equals(SE_ROCK)){
targetObject=gameObject; //south east rock
break;
}
}
} else { //looking for the grinder
//extend search outside the players set radius
targetObject = utils.getGameObjects(26199).get(0);
targetObject = utils.getGameObjects(ObjectID.GRINDER).get(0);
}
opcode = (config.customOpcode() && config.objectOpcode() ? config.objectOpcodeValue() : MenuOpcode.GAME_OBJECT_FIRST_OPTION.getId());
if (targetObject != null)
{

View File

@ -3,6 +3,7 @@ package net.runelite.client.plugins.powerskiller;
public enum PowerSkillerType
{
DENSE_ESSENCE,
SANDSTONE,
GAME_OBJECT,
NPC
}

View File

@ -23,7 +23,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
version = "2.8.1"
version = "2.9.0"
project.extra["PluginName"] = "Quick Eater"
project.extra["PluginDescription"] = "Illumine - auto eat food below configured HP"

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.