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-08-11 01:16:03 +02:00
parent 68a72419c2 c2026f5516
commit f7a055fa5a
14 changed files with 111 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+6 -2
View File
@@ -8159,7 +8159,7 @@ public final class ItemID
public static final int HUMAN_EYE = 12843;
public static final int VOICE_POTION = 12844;
public static final int GRIM_REAPER_HOOD = 12845;
public static final int BOUNTY_TELEPORT_SCROLL = 12846;
public static final int TARGET_TELEPORT_SCROLL = 12846;
public static final int GRANITE_MAUL_12848 = 12848;
public static final int GRANITE_CLAMP = 12849;
public static final int AMULET_OF_THE_DAMNED_FULL = 12851;
@@ -11321,7 +11321,7 @@ public final class ItemID
public static final int BIRTHDAY_CAKE_24331 = 24331;
public static final int BIRTHDAY_CAKE_24332 = 24332;
public static final int DAGONHAI_ROBES_SET = 24333;
public static final int BOUNTY_TARGET_TELEPORT = 24336;
public static final int TARGET_TELEPORT = 24336;
public static final int BOUNTY_HUNTER_HAT_TIER_1 = 24338;
public static final int BOUNTY_HUNTER_HAT_TIER_2 = 24340;
public static final int BOUNTY_HUNTER_HAT_TIER_3 = 24342;
@@ -11589,5 +11589,9 @@ public final class ItemID
public static final int SKELETON_MONKEY = 24865;
public static final int KRUK_JR = 24866;
public static final int PRINCELY_MONKEY = 24867;
public static final int GOLDEN_ARMADYL_SPECIAL_ATTACK = 24868;
public static final int GOLDEN_BANDOS_SPECIAL_ATTACK = 24869;
public static final int GOLDEN_SARADOMIN_SPECIAL_ATTACK = 24870;
public static final int GOLDEN_ZAMORAK_SPECIAL_ATTACK = 24871;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
-14
View File
@@ -18031,22 +18031,8 @@ public final class NullObjectID
public static final int NULL_37430 = 37430;
public static final int NULL_37432 = 37432;
public static final int NULL_37433 = 37433;
public static final int NULL_37436 = 37436;
public static final int NULL_37437 = 37437;
public static final int NULL_37438 = 37438;
public static final int NULL_37439 = 37439;
public static final int NULL_37440 = 37440;
public static final int NULL_37446 = 37446;
public static final int NULL_37447 = 37447;
public static final int NULL_37448 = 37448;
public static final int NULL_37449 = 37449;
public static final int NULL_37451 = 37451;
public static final int NULL_37452 = 37452;
public static final int NULL_37453 = 37453;
public static final int NULL_37454 = 37454;
public static final int NULL_37455 = 37455;
public static final int NULL_37456 = 37456;
public static final int NULL_37457 = 37457;
public static final int NULL_37467 = 37467;
public static final int NULL_37468 = 37468;
public static final int NULL_37469 = 37469;
runelite-api/src/main/java/net/runelite/api/ObjectID.java
-1
View File
@@ -19396,7 +19396,6 @@ public final class ObjectID
public static final int DECORATIVE_WINDOW_37442 = 37442;
public static final int STAINEDGLASS_WINDOW_37443 = 37443;
public static final int LOG_PILE_37444 = 37444;
public static final int HOTSPOT_MARKER = 37445;
public static final int DECORATIVE_WINDOW_37450 = 37450;
public static final int STAINEDGLASS_WINDOW_37458 = 37458;
public static final int DECORATIVE_WINDOW_37459 = 37459;
runelite-api/src/main/java/net/runelite/api/ScriptID.java
+6
View File
@@ -341,4 +341,10 @@ public final class ScriptID
*/
@ScriptArguments(integer = 17)
public static final int BANKMAIN_BUILD = 277;
@ScriptArguments(integer = 19)
public static final int BANKMAIN_FINISHBUILDING = 505;
@ScriptArguments()
public static final int BANKMAIN_SEARCHING = 514;
}
runelite-api/src/main/java/net/runelite/api/vars/SlayerUnlock.java
+7 -1
View File
@@ -79,7 +79,13 @@ public enum SlayerUnlock
RUNE_DRAGON_EXTEND(41),
VORKATH_SLAYER_HELM(42),
FOSSIL_ISLAND_WYVERN_DISABLE(43, Varbits.FOSSIL_ISLAND_WYVERN_DISABLE),
GROTESQUE_GUARDIAN_DOUBLE_COUNT(44);
GROTESQUE_GUARDIAN_DOUBLE_COUNT(44),
HYDRA_SLAYER_HELM(45),
BASILISK_EXTEND(46),
BASILISK_UNLOCK(47),
OLM_SLAYER_HELM(48),
VAMPYRE_EXTEND(49),
VAMPYRE_UNLOCK(50);
private Varbits toggleVarbit;
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+4 -4
View File
@@ -1154,10 +1154,10 @@ public class WidgetID
static final int SKULL = 56; // OUTDATED?
static final int ATTACK_RANGE = 59; // OUTDATED?
static final int BOUNTY_HUNTER_INFO = 6;
static final int KILLDEATH_RATIO = 34;
static final int SKULL_CONTAINER = 54;
static final int SAFE_ZONE = 56;
static final int WILDERNESS_LEVEL = 59; // this can also be the Deadman Mode "Protection" text
static final int KILLDEATH_RATIO = 28;
static final int SKULL_CONTAINER = 48;
static final int SAFE_ZONE = 50;
static final int WILDERNESS_LEVEL = 53; // this can also be the Deadman Mode "Protection" text
}
static class KourendFavour