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
2020-03-18 13:23:44 +01:00
parent 82555d4064 84a23cb59d
commit 37701fd310
24 changed files with 1100 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runelite-api/src/main/java/net/runelite/api/Experience.java
View File

@@ -127,8 +127,8 @@ public class Experience
private static double getMeleeRangeOrMagicCombatLevelContribution(int attackLevel, int strengthLevel, int magicLevel, int rangeLevel)
{
double melee = 0.325 * (attackLevel + strengthLevel);
double range = 0.325 * (Math.floor(rangeLevel / 2) + rangeLevel);
double magic = 0.325 * (Math.floor(magicLevel / 2) + magicLevel);
double range = 0.325 * (rangeLevel / 2 + rangeLevel);
double magic = 0.325 * (magicLevel / 2 + magicLevel);
return Math.max(melee, Math.max(range, magic));
}
@@ -152,7 +152,7 @@ public class Experience
int defenceLevel, int hitpointsLevel, int magicLevel,
int rangeLevel, int prayerLevel)
{
double base = 0.25 * (defenceLevel + hitpointsLevel + Math.floor(prayerLevel / 2));
double base = 0.25 * (defenceLevel + hitpointsLevel + (prayerLevel / 2));
double typeContribution = getMeleeRangeOrMagicCombatLevelContribution(attackLevel, strengthLevel, magicLevel, rangeLevel);

2
runelite-api/src/main/java/net/runelite/api/ItemID.java
View File

@@ -11142,7 +11142,7 @@ public final class ItemID
public static final int CRYSTAL_SHIELD = 23991;
public static final int CRYSTAL_SHIELD_INACTIVE = 23993;
public static final int BLADE_OF_SAELDOR = 23995;
public static final int BLADE_OF_SAELDOR_23996 = 23996;
public static final int BLADE_OF_SAELDOR_23996 = 23996;
public static final int BLADE_OF_SAELDOR_INACTIVE = 23997;
public static final int BLADE_OF_SAELDOR_INACTIVE_23999 = 23999;
public static final int CRYSTAL_GRAIL = 24000;

32
runelite-api/src/main/java/net/runelite/api/ScriptID.java
View File

@@ -270,5 +270,37 @@ public final class ScriptID
*/
@ScriptArguments(integer = 2)
public static final int TOPLEVEL_RESIZE = 909;
/**
* Called when the friends list is updated
* <ul>
* <li> int (WidgetID) Friends list "full container" </li>
* <li> int (WidgetID) Friends list sort by name button </li>
* <li> int (WidgetID) Friends list sort by last world change button </li>
* <li> int (WidgetID) Friends list sort by world button </li>
* <li> int (WidgetID) Friends list legacy sort button </li>
* <li> int (WidgetID) Friends list names container </li>
* <li> int (WidgetID) Friends list scroll bar </li>
* <li> int (WidgetID) Friends list "loading please wait" text </li>
* <li> int (WidgetID) Friends list player previous name holder </li>
* </ul>
*/
@ScriptArguments(integer = 9)
public static final int FRIENDS_UPDATE = 631;
/**
* Called when the ignore list is updated
* <ul>
* <li> int (WidgetID) Ignore list "full container" </li>
* <li> int (WidgetID) Ignore list sort by name button </li>
* <li> int (WidgetID) Ignore list legacy sort button </li>
* <li> int (WidgetID) Ignore list names container </li>
* <li> int (WidgetID) Ignore list scroll bar </li>
* <li> int (WidgetID) Ignore list "loading please wait" text </li>
* <li> int (WidgetID) Ignore list player previous name holder </li>
* </ul>
*/
@ScriptArguments(integer = 7)
public static final int IGNORE_UPDATE = 630;
}

28
runelite-api/src/main/java/net/runelite/api/Varbits.java
View File

@@ -499,6 +499,34 @@ public enum Varbits
*/
OXYGEN_LEVEL(5811),
/**
* Drift net status
*
* Expected values
* 0 = Unset
* 1 = Set up
* 2 = Caught some fish
* 3 = Full
*/
NORTH_NET_STATUS(5812),
SOUTH_NET_STATUS(5814),
/**
* Drift net catch count
*/
NORTH_NET_CATCH_COUNT(5813),
SOUTH_NET_CATCH_COUNT(5815),
/**
* Drift net collect interface
*
* Expected values:
* 0 = Not open
* 1 = North interface open
* 2 = South interface open
*/
DRIFT_NET_COLLECT(5933),
/**
* Corp beast damage
*/

16
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -249,11 +249,27 @@ public class WidgetID
static class FriendList
{
static final int TITLE = 3;
static final int FULL_CONTAINER = 5;
static final int SORT_BY_NAME_BUTTON = 7;
static final int SORT_BY_LAST_WORLD_CHANGE_BUTTON = 8;
static final int SORT_BY_WORLD_BUTTON = 9;
static final int LEGACY_SORT_BUTTON = 10;
static final int NAMES_CONTAINER = 11;
static final int SCROLL_BAR = 12;
static final int LOADING_TEXT = 13;
static final int PREVIOUS_NAME_HOLDER = 18;
}
static class IgnoreList
{
static final int TITLE = 3;
static final int FULL_CONTAINER = 5;
static final int SORT_BY_NAME_BUTTON = 7;
static final int LEGACY_SORT_BUTTON = 8;
static final int NAMES_CONTAINER = 9;
static final int SCROLL_BAR = 10;
static final int LOADING_TEXT = 11;
static final int PREVIOUS_NAME_HOLDER = 16;
}
static class ClanChat

16
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -123,8 +123,24 @@ public enum WidgetInfo
VOLCANIC_MINE_VENT_C_STATUS(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.VENT_C_STATUS),
FRIEND_CHAT_TITLE(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.TITLE),
FRIEND_LIST_FULL_CONTAINER(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.FULL_CONTAINER),
FRIEND_LIST_SORT_BY_NAME_BUTTON(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.SORT_BY_NAME_BUTTON),
FRIEND_LIST_SORT_BY_LAST_WORLD_CHANGE_BUTTON(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.SORT_BY_LAST_WORLD_CHANGE_BUTTON),
FRIEND_LIST_SORT_BY_WORLD_BUTTON(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.SORT_BY_WORLD_BUTTON),
FRIEND_LIST_LEGACY_SORT_BUTTON(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.LEGACY_SORT_BUTTON),
FRIEND_LIST_NAMES_CONTAINER(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.NAMES_CONTAINER),
FRIEND_LIST_SCROLL_BAR(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.SCROLL_BAR),
FRIEND_LIST_LOADING_TEXT(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.LOADING_TEXT),
FRIEND_LIST_PREVIOUS_NAME_HOLDER(WidgetID.FRIENDS_LIST_GROUP_ID, WidgetID.FriendList.PREVIOUS_NAME_HOLDER),
IGNORE_TITLE(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.TITLE),
IGNORE_FULL_CONTAINER(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.FULL_CONTAINER),
IGNORE_SORT_BY_NAME_BUTTON(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.SORT_BY_NAME_BUTTON),
IGNORE_LEGACY_SORT_BUTTON(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.LEGACY_SORT_BUTTON),
IGNORE_NAMES_CONTAINER(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.NAMES_CONTAINER),
IGNORE_SCROLL_BAR(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.SCROLL_BAR),
IGNORE_LOADING_TEXT(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.LOADING_TEXT),
IGNORE_PREVIOUS_NAME_HOLDER(WidgetID.IGNORE_LIST_GROUP_ID, WidgetID.IgnoreList.PREVIOUS_NAME_HOLDER),
EXPLORERS_RING_ALCH_INVENTORY(WidgetID.EXPLORERS_RING_ALCH_GROUP_ID, WidgetID.ExplorersRing.INVENTORY),