ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2022-04-30 02:03:53 +02:00
parent ba8811628b a7c45ae401
commit a857e82b4d
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/hotcold/HotColdLocation.java
View File

@@ -75,6 +75,7 @@ public enum HotColdLocation
DESERT_UZER(MASTER, new WorldPoint(3432, 3105, 0), DESERT, "West of Uzer.", BRASSICAN_MAGE), DESERT_UZER(MASTER, new WorldPoint(3432, 3105, 0), DESERT, "West of Uzer.", BRASSICAN_MAGE),
DESERT_POLLNIVNEACH(MASTER, new WorldPoint(3288, 2976, 0), DESERT, "West of Pollnivneach.", BRASSICAN_MAGE), DESERT_POLLNIVNEACH(MASTER, new WorldPoint(3288, 2976, 0), DESERT, "West of Pollnivneach.", BRASSICAN_MAGE),
DESERT_MTA(MASTER, new WorldPoint(3347, 3295, 0), DESERT, "Next to Mage Training Arena.", BRASSICAN_MAGE), DESERT_MTA(MASTER, new WorldPoint(3347, 3295, 0), DESERT, "Next to Mage Training Arena.", BRASSICAN_MAGE),
DESERT_RUINS_OF_ULLEK(MASTER, new WorldPoint(3428, 2773, 0), DESERT, "South-east of Ruins of Ullek.", BRASSICAN_MAGE),
DESERT_SHANTY(MASTER, new WorldPoint(3292, 3107, 0), DESERT, "South-west of Shantay Pass.", BRASSICAN_MAGE), DESERT_SHANTY(MASTER, new WorldPoint(3292, 3107, 0), DESERT, "South-west of Shantay Pass.", BRASSICAN_MAGE),
DRAYNOR_MANOR_MUSHROOMS(BEGINNER, new WorldPoint(3096, 3379, 0), MISTHALIN, "Patch of mushrooms just northwest of Draynor Manor"), DRAYNOR_MANOR_MUSHROOMS(BEGINNER, new WorldPoint(3096, 3379, 0), MISTHALIN, "Patch of mushrooms just northwest of Draynor Manor"),
DRAYNOR_WHEAT_FIELD(BEGINNER, new WorldPoint(3120, 3282, 0), MISTHALIN, "Inside the wheat field next to Draynor Village"), DRAYNOR_WHEAT_FIELD(BEGINNER, new WorldPoint(3120, 3282, 0), MISTHALIN, "Inside the wheat field next to Draynor Village"),

4
runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/CrowdsourcingMovement.java
View File

@@ -69,7 +69,9 @@ public class CrowdsourcingMovement
int distance = nextPoint.distanceTo(lastPoint); int distance = nextPoint.distanceTo(lastPoint);
if (distance > 2 || nextIsInInstance != lastIsInInstance) if (distance > 2 || nextIsInInstance != lastIsInInstance)
{ {
MovementData data = new MovementData(lastPoint, nextPoint, lastIsInInstance, nextIsInInstance, ticksStill, lastClick); MovementData data = new MovementData(lastPoint, nextPoint, lastIsInInstance, nextIsInInstance,
ticksStill, lastClick.getMenuAction(), lastClick.getId(), lastClick.getMenuOption(),
lastClick.getMenuTarget(), lastClick.getParam0(), lastClick.getParam1());
manager.storeEvent(data); manager.storeEvent(data);
} }
if (distance > 0) if (distance > 0)

9
runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/movement/MovementData.java
View File

@@ -27,8 +27,8 @@ package net.runelite.client.plugins.crowdsourcing.movement;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import net.runelite.api.MenuAction;
import net.runelite.api.coords.WorldPoint; import net.runelite.api.coords.WorldPoint;
import net.runelite.api.events.MenuOptionClicked;
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@@ -39,5 +39,10 @@ public class MovementData
private final boolean fromInstance; private final boolean fromInstance;
private final boolean toInstance; private final boolean toInstance;
private final int ticks; private final int ticks;
private MenuOptionClicked lastClick; private MenuAction menuAction;
private int menuIdentifier;
private String menuOption;
private String menuTarget;
private int param0;
private int param1;
} }