Skip to content
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 @@ -26,7 +26,7 @@
)
@Slf4j
public class MageTrainingArenaPlugin extends Plugin {
public static final String version = "1.1.8";
public static final String version = "1.1.9";

@Inject
private MageTrainingArenaConfig config;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.runelite.api.gameval.*;
import net.runelite.api.coords.LocalPoint;
import net.runelite.api.coords.WorldPoint;
import net.runelite.api.widgets.Widget;
import net.runelite.client.plugins.microbot.Microbot;
import net.runelite.client.plugins.microbot.Script;
import net.runelite.client.plugins.microbot.globval.enums.InterfaceTab;
Expand Down Expand Up @@ -584,10 +585,12 @@ private void buyReward(Rewards reward) {
}

Rs2Inventory.waitForInventoryChanges(() -> {
var rewardWidgets = Rs2Widget.getWidget(197, 11).getDynamicChildren();
if (rewardWidgets == null) return;
var widget = Arrays.stream(rewardWidgets).filter(x -> x.getItemId() == reward.getItemId()).findFirst().orElse(null);
Rs2Widget.clickWidgetFast(widget, Arrays.asList(rewardWidgets).indexOf(widget));
var rewardContainer = Rs2Widget.getWidget(197, 11);
if (rewardContainer == null) return;
var rewardWidgets = rewardContainer.getDynamicChildren();
var index = findRewardIndex(rewardWidgets, reward.getItemId());
if (index < 0) return;
Rs2Widget.clickWidgetFast(rewardWidgets[index], index);
sleepGaussian(600, 150);
Rs2Widget.clickWidget(197, 9);
sleepGaussian(600, 150);
Expand All @@ -605,6 +608,14 @@ private void buyReward(Rewards reward) {
}
}

static int findRewardIndex(Widget[] rewardWidgets, int itemId) {
if (rewardWidgets == null) return -1;
for (int i = 0; i < rewardWidgets.length; i++) {
if (rewardWidgets[i] != null && rewardWidgets[i].getItemId() == itemId) return i;
}
return -1;
}

public static Rooms getCurrentRoom() {
for (var room : Rooms.values()) {
if (room == Rooms.TELEKINETIC && Arrays.stream(TelekineticRooms.values()).anyMatch(x -> Rs2Player.getWorldLocation().distanceTo(x.getArea()) == 0)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package net.runelite.client.plugins.microbot.magetrainingarena;

import net.runelite.api.widgets.Widget;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

class MageTrainingArenaScriptTest {

private static Widget item(int itemId) {
Widget widget = mock(Widget.class);
when(widget.getItemId()).thenReturn(itemId);
return widget;
}

@Test
void unloadedRewardListHasNoReward() {
assertEquals(-1, MageTrainingArenaScript.findRewardIndex(null, 6908));
}

@Test
void missingRewardIsNotClicked() {
Widget[] widgets = {item(6908), item(6910)};
assertEquals(-1, MageTrainingArenaScript.findRewardIndex(widgets, 6912));
}

@Test
void matchingRewardReturnsItsIndex() {
Widget[] widgets = {item(6908), null, item(6910)};
assertEquals(2, MageTrainingArenaScript.findRewardIndex(widgets, 6910));
}
}
Loading