Skip to content
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.

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

Random patch for a user in wildy mode and changes to config #659

Merged
merged 1 commit into from
Jan 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public interface MossKillerConfig extends Config {
@ConfigItem(
keyName = "equipmentGuide",
name = "Equipment Details",
description = "Recommended equipment for advanced users.",
description = "List of required equipment.",
position = 1,
section = advancedGuideSection // Links this to the Advanced Guide section
)
Expand Down Expand Up @@ -67,7 +67,7 @@ default String equipmentGuide() {
default String instructionsGuide() {
return "Select Wildy Mode.\n"
+ "Start the plugin near a bank in f2p with no armor or weapons and every listed piece of equipment in the bank.\n"
+ "Turn on Teleportation spells in Web Walker configuration. Turn on PK skull prevention in OSRS settings.\n"
+ "Turn on Teleportation spells in Web Walker configuration. Turn on Breakhandler. Turn on PK skull prevention in OSRS settings.\n"
+ "Minimum required skill levels:\n"
+ "- 40 Range\n"
+ "- 41 Mage\n"
Expand All @@ -76,6 +76,7 @@ default String instructionsGuide() {
+ "- 30 Strength\n"
+ "Ideal skill levels:\n"
+ "- 70 Strength\n"
+ "- 55 Magic\n"
+ "- 43 Prayer\n"
+ "---------------------------------\n"
+ "This plugin will train your defense to 50 automatically";
Expand All @@ -90,14 +91,17 @@ default String instructionsGuide() {
section = basicGuideSection // Belongs to Basic Guide
)
default String GUIDE() {
return "NORMAL: Have runes for teleport to Varrock, swordfish, and bronze axe in the bank. Start in Varrock East Bank. Turn off Teleportation spells in Web Walker configuration.";
return "NORMAL: Have runes for teleport to Varrock, swordfish, and bronze axe in the bank. Start in Varrock East Bank. Turn off Teleportation spells in Web Walker configuration.\n"
+ "ADVANCED: See Advanced Guide.\n"
+ "TIPS: For tips with the plugin visit Microbot Discord -> Community Plugins -> Moss Killer Plugin";
}

@ConfigItem(
keyName = "wildySelector",
name = "Wildy Mode",
description = "Enable this for killing Moss Giants in the Wilderness.",
position = 2
position = 2,
section = advancedGuideSection
)
default boolean wildy() {
return false;
Expand All @@ -107,7 +111,8 @@ default boolean wildy() {
keyName = "combatMode",
name = "Combat Mode",
description = "Select the combat mode: Flee, Fight, or Lure",
position = 3
position = 3,
section = advancedGuideSection
)
default CombatMode combatMode() {
return CombatMode.FIGHT; // Default option
Expand All @@ -129,7 +134,8 @@ default boolean isHideOverlay() {
keyName = "buryBones",
name = "Bury Bones",
description = "Select this if you want to loot and bury bones",
position = 6
position = 4,
section = advancedGuideSection
)
default boolean buryBones() {
return false;
Expand All @@ -139,7 +145,8 @@ default boolean buryBones() {
keyName = "forceDefensive",
name = "Force Defensive",
description = "Select this if you want to autocast defensive after 60 Defence.",
position = 7
position = 5,
section = advancedGuideSection
)
default boolean forceDefensive() {
return false;
Expand Down Expand Up @@ -217,4 +224,4 @@ default boolean isSlashWeaponEquipped() {
return true;
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1461,7 +1461,6 @@ public void walkToMossGiants() {
Microbot.log("You're in the wilderness and I don't get the problem");
if (Rs2Equipment.isNaked()) {state = MossKillerState.WALK_TO_BANK;}}
if (playerLocation.getY() < 3520) {
Microbot.log("You're not in the wilderness and low or Absent on Minds");
state = MossKillerState.WALK_TO_BANK;
}
}
Expand Down Expand Up @@ -1998,20 +1997,20 @@ public void walkToAndTeleport() {
|| BreakHandlerScript.breakIn <= 120
|| !Rs2Inventory.contains(FOOD)
|| !Rs2Inventory.hasItemAmount(MIND_RUNE, 15)) {
// while my dude is under attack
// while (whateverCondition (under attack) from plugin && this.isRunning())
if (scheduledFuture.isDone() && !Rs2Inventory.hasItemAmount(FOOD, 17)) { // Only initiate if not already walking to Twenty Wild
handleAsynchWalk("Twenty Wild");
}

if (Rs2Inventory.hasItemAmount(FOOD, 17)) {
state = MossKillerState.WALK_TO_MOSS_GIANTS;
}
Microbot.log("Hitting Return");
return;
} else if (Rs2Walker.getDistanceBetween(playerLocation, TWENTY_WILD) < 5) {
teleportAndStopWalking();
}

// Check if the player has teleported (Y-coordinate condition)
if (playerLocation.getY() < 3500) {
if (playerLocation.getY() < 3500) {
Microbot.log("Teleport successful.");
state = MossKillerState.WALK_TO_BANK;
}
Expand Down