Stop on no runes #1473
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,5 @@ public enum MagicActivity { | |
| TELEALCH, | ||
| STUNALCH, | ||
| STUNTELEALCH, // NEW | ||
| SPINFLAX, | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| package net.runelite.client.plugins.microbot.magic.aiomagic.scripts; | ||
|
|
||
| import net.runelite.api.Skill; | ||
| import net.runelite.api.gameval.ItemID; | ||
| import net.runelite.client.plugins.microbot.Microbot; | ||
| import net.runelite.client.plugins.microbot.Script; | ||
| import net.runelite.client.plugins.microbot.magic.aiomagic.AIOMagicPlugin; | ||
| import net.runelite.client.plugins.microbot.magic.aiomagic.enums.MagicState; | ||
| import net.runelite.client.plugins.microbot.util.antiban.Rs2Antiban; | ||
| import net.runelite.client.plugins.microbot.util.antiban.Rs2AntibanSettings; | ||
| import net.runelite.client.plugins.microbot.util.antiban.enums.Activity; | ||
| import net.runelite.client.plugins.microbot.util.bank.Rs2Bank; | ||
| import net.runelite.client.plugins.microbot.util.inventory.Rs2Inventory; | ||
| import net.runelite.client.plugins.microbot.util.magic.Rs2Magic; | ||
| import net.runelite.client.plugins.microbot.util.magic.Rs2Spells; | ||
| import net.runelite.client.plugins.microbot.util.magic.Runes; | ||
| import net.runelite.client.plugins.microbot.util.player.Rs2Player; | ||
|
|
||
| import javax.inject.Inject; | ||
| import java.util.concurrent.TimeUnit; | ||
|
|
||
| public class SpinFlaxScript extends Script { | ||
|
|
||
| private MagicState state; | ||
| private int castsDone; | ||
|
|
||
| private final AIOMagicPlugin plugin; | ||
|
|
||
| @Inject | ||
| public SpinFlaxScript(AIOMagicPlugin plugin) { | ||
| this.plugin = plugin; | ||
| } | ||
|
|
||
| public boolean run() { | ||
| Microbot.enableAutoRunOn = false; | ||
| Rs2Antiban.resetAntibanSettings(); | ||
| Rs2Antiban.antibanSetupTemplates.applyGeneralBasicSetup(); | ||
| Rs2AntibanSettings.simulateAttentionSpan = true; | ||
| Rs2AntibanSettings.nonLinearIntervals = true; | ||
| Rs2AntibanSettings.contextualVariability = true; | ||
| Rs2AntibanSettings.usePlayStyle = true; | ||
| Rs2Antiban.setActivity(Activity.CASTING_SPIN_FLAX); | ||
|
|
||
| mainScheduledFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> { | ||
| try { | ||
| if (!Microbot.isLoggedIn()) return; | ||
| if (!super.run()) return; | ||
|
|
||
| if (!Rs2Player.getSkillRequirement(Skill.MAGIC, 76)) { | ||
| Microbot.showMessage("Spin Flax requires 76 Magic."); | ||
| shutdown(); | ||
| return; | ||
| } | ||
|
|
||
| if (state == null) { | ||
| state = MagicState.BANKING; | ||
| castsDone = 0; | ||
| } | ||
|
|
||
| switch (state) { | ||
| case BANKING: | ||
| Microbot.status = "Banking: prepare 25 flax"; | ||
| boolean isBankOpen = Rs2Bank.isNearBank(15) ? Rs2Bank.useBank() : Rs2Bank.walkToBankAndUseBank(); | ||
| if (!isBankOpen || !Rs2Bank.isOpen()) return; | ||
|
|
||
| Rs2Bank.depositAll(ItemID.BOW_STRING); | ||
| Rs2Inventory.waitForInventoryChanges(1200); | ||
|
|
||
| boolean hasAstralInv = Rs2Inventory.hasItem(Runes.ASTRAL.getItemId()); | ||
| boolean hasNatureInv = Rs2Inventory.hasItem(Runes.NATURE.getItemId()); | ||
| boolean hasAirInv = Rs2Inventory.hasItem(Runes.AIR.getItemId()); | ||
|
|
||
| boolean hasAstralBank = Rs2Bank.hasItem(Runes.ASTRAL.getItemId()); | ||
| boolean hasNatureBank = Rs2Bank.hasItem(Runes.NATURE.getItemId()); | ||
| boolean hasAirBank = Rs2Bank.hasItem(Runes.AIR.getItemId()); | ||
|
|
||
| if (!hasAstralBank && !hasAstralInv) { Microbot.showMessage("Astral runes not found in bank."); shutdown(); return; } | ||
| if (!hasNatureBank && !hasNatureInv) { Microbot.showMessage("Nature runes not found in bank."); shutdown(); return; } | ||
| if (!hasAirBank && !hasAirInv) { Microbot.showMessage("Air runes not found in bank."); shutdown(); return; } | ||
|
|
||
| if (hasAstralBank) { if (!Rs2Bank.withdrawAll(Runes.ASTRAL.getItemId())) return; Rs2Inventory.waitForInventoryChanges(1200); } | ||
| if (hasNatureBank) { if (!Rs2Bank.withdrawAll(Runes.NATURE.getItemId())) return; Rs2Inventory.waitForInventoryChanges(1200); } | ||
| if (hasAirBank) { if (!Rs2Bank.withdrawAll(Runes.AIR.getItemId())) return; Rs2Inventory.waitForInventoryChanges(1200); } | ||
|
|
||
|
Comment on lines
+69
to
+84
Contributor
There was a problem hiding this comment. Critical: False shutdown when runes are in rune pouch The early rune checks only consider inventory/bank and ignore the rune pouch. Players with runes in the pouch will get an unnecessary shutdown despite being able to cast. Use Rs2Magic.hasRequiredRunes(...) (which already accounts for inventory/equipment/pouch) to decide shutdown vs. withdrawal. Apply this diff to make the bank step pouch-aware and only stop when neither local sources nor bank can satisfy runes: - boolean hasAstralInv = Rs2Inventory.hasItem(Runes.ASTRAL.getItemId());
- boolean hasNatureInv = Rs2Inventory.hasItem(Runes.NATURE.getItemId());
- boolean hasAirInv = Rs2Inventory.hasItem(Runes.AIR.getItemId());
-
+ boolean haveRunesLocal = Rs2Magic.hasRequiredRunes(Rs2Spells.SPIN_FLAX);
boolean hasAstralBank = Rs2Bank.hasItem(Runes.ASTRAL.getItemId());
boolean hasNatureBank = Rs2Bank.hasItem(Runes.NATURE.getItemId());
boolean hasAirBank = Rs2Bank.hasItem(Runes.AIR.getItemId());
- if (!hasAstralBank && !hasAstralInv) { Microbot.showMessage("Astral runes not found in bank."); shutdown(); return; }
- if (!hasNatureBank && !hasNatureInv) { Microbot.showMessage("Nature runes not found in bank."); shutdown(); return; }
- if (!hasAirBank && !hasAirInv) { Microbot.showMessage("Air runes not found in bank."); shutdown(); return; }
+ if (!haveRunesLocal && !hasAstralBank && !hasNatureBank && !hasAirBank) {
+ Microbot.showMessage("Spin Flax: no required runes in inventory/equipment/pouch or bank. Stopping.");
+ shutdown();
+ return;
+ }
if (hasAstralBank) { if (!Rs2Bank.withdrawAll(Runes.ASTRAL.getItemId())) return; Rs2Inventory.waitForInventoryChanges(1200); }
if (hasNatureBank) { if (!Rs2Bank.withdrawAll(Runes.NATURE.getItemId())) return; Rs2Inventory.waitForInventoryChanges(1200); }
if (hasAirBank) { if (!Rs2Bank.withdrawAll(Runes.AIR.getItemId())) return; Rs2Inventory.waitForInventoryChanges(1200); }
🤖 Prompt for AI Agents |
||
| if (!Rs2Bank.hasBankItem(ItemID.FLAX, 1)) { | ||
| Microbot.showMessage("No flax in bank."); | ||
| shutdown(); | ||
| return; | ||
| } | ||
|
|
||
| int empty = Rs2Inventory.emptySlotCount(); | ||
| if (empty < 25) { | ||
| Rs2Bank.depositAll(ItemID.BOW_STRING); | ||
| Rs2Inventory.waitForInventoryChanges(1200); | ||
| empty = Rs2Inventory.emptySlotCount(); | ||
| if (empty < 25) return; // wait next tick | ||
| } | ||
|
|
||
| if (!Rs2Bank.withdrawX(ItemID.FLAX, 25)) return; | ||
| Rs2Inventory.waitForInventoryChanges(1200); | ||
|
|
||
| Rs2Bank.closeBank(); | ||
| castsDone = 0; | ||
| state = MagicState.CASTING; | ||
| break; | ||
|
|
||
| case CASTING: | ||
| Microbot.status = "Casting: Spin Flax (" + castsDone + "/5)"; | ||
|
|
||
| if (!Rs2Inventory.hasItem(ItemID.FLAX)) { | ||
| state = MagicState.BANKING; | ||
| break; | ||
| } | ||
|
|
||
| if (!Rs2Magic.hasRequiredRunes(Rs2Spells.SPIN_FLAX)) { | ||
| Microbot.showMessage("Out of runes for Spin Flax"); | ||
| shutdown(); | ||
| return; | ||
| } | ||
|
|
||
| if (castsDone >= 5) { | ||
| state = MagicState.BANKING; | ||
| break; | ||
| } | ||
|
|
||
| if (!Rs2Magic.cast(Rs2Spells.SPIN_FLAX)) { | ||
| Microbot.log("Unable to cast Spin Flax"); | ||
| state = MagicState.BANKING; | ||
| break; | ||
| } | ||
| Rs2Player.waitForXpDrop(Skill.MAGIC, 10000, false); | ||
| castsDone++; | ||
| break; | ||
| } | ||
|
|
||
| } catch (Exception ex) { | ||
| System.out.println(ex.getMessage()); | ||
| } | ||
| }, 0, 1000, TimeUnit.MILLISECONDS); | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void shutdown() { | ||
| Rs2Antiban.resetAntibanSettings(); | ||
| super.shutdown(); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,7 +52,14 @@ public boolean run() { | |
| } | ||
|
|
||
| if (!Rs2Magic.hasRequiredRunes(plugin.getAlchSpell())) { | ||
| Microbot.showMessage("Out of runes for alchemy"); | ||
| shutdown(); | ||
| return; | ||
| } | ||
|
|
||
| if (!Rs2Magic.hasRequiredRunes(plugin.getStunSpell().getRs2Spell())) { | ||
| Microbot.showMessage("Out of runes for " + plugin.getStunSpell().name()); | ||
| shutdown(); | ||
| return; | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wrong display name for UNSTRUNG_SYMBOL breaks widget clicks.
Crafting widget button is “unstrung symbol”; using “holy symbol” will likely fail selection.
📝 Committable suggestion
🤖 Prompt for AI Agents