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

Merge pull request #1481 from pklite/upstream

Browse Source 
upstream
This commit is contained in:
Kyle
2019-08-29 12:54:45 +01:00
committed by GitHub
parent d3768f2208 8d0adb68c8
commit c18e8e6dea
13 changed files with 275 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+71
View File
@@ -11179,5 +11179,76 @@ public final class ItemID
public static final int COMBAT_PATH_STARTER_KIT = 24130;
public static final int COMBAT_PATH_VOUCHER = 24131;
public static final int MARBLE_LECTERN = 24132;
public static final int INFERNAL_MAX_CAPE_L = 24133;
public static final int FIRE_MAX_CAPE_L = 24134;
public static final int ASSEMBLER_MAX_CAPE_L = 24135;
public static final int BRONZE_DEFENDER_L = 24136;
public static final int IRON_DEFENDER_L = 24137;
public static final int STEEL_DEFENDER_L = 24138;
public static final int BLACK_DEFENDER_L = 24139;
public static final int MITHRIL_DEFENDER_L = 24140;
public static final int ADAMANT_DEFENDER_L = 24141;
public static final int RUNE_DEFENDER_L = 24142;
public static final int DRAGON_DEFENDER_L = 24143;
public static final int STAFF_OF_BALANCE = 24144;
public static final int ARMADYL_HALO_BROKEN = 24147;
public static final int BANDOS_HALO_BROKEN = 24149;
public static final int SEREN_HALO_BROKEN = 24151;
public static final int ANCIENT_HALO_BROKEN = 24153;
public static final int BRASSICA_HALO_BROKEN = 24155;
public static final int DECORATIVE_SWORD_L = 24157;
public static final int DECORATIVE_ARMOUR_L = 24158;
public static final int DECORATIVE_ARMOUR_L_24159 = 24159;
public static final int DECORATIVE_HELM_L = 24160;
public static final int DECORATIVE_SHIELD_L = 24161;
public static final int DECORATIVE_ARMOUR_L_24162 = 24162;
public static final int DECORATIVE_ARMOUR_L_24163 = 24163;
public static final int DECORATIVE_ARMOUR_L_24164 = 24164;
public static final int DECORATIVE_ARMOUR_L_24165 = 24165;
public static final int DECORATIVE_ARMOUR_L_24166 = 24166;
public static final int DECORATIVE_ARMOUR_L_24167 = 24167;
public static final int DECORATIVE_ARMOUR_L_24168 = 24168;
public static final int SARADOMIN_HALO_L = 24169;
public static final int ZAMORAK_HALO_L = 24170;
public static final int GUTHIX_HALO_L = 24171;
public static final int HEALER_HAT_L = 24172;
public static final int FIGHTER_HAT_L = 24173;
public static final int RANGER_HAT_L = 24174;
public static final int FIGHTER_TORSO_L = 24175;
public static final int PENANCE_SKIRT_L = 24176;
public static final int VOID_KNIGHT_TOP_L = 24177;
public static final int ELITE_VOID_TOP_L = 24178;
public static final int VOID_KNIGHT_ROBE_L = 24179;
public static final int ELITE_VOID_ROBE_L = 24180;
public static final int VOID_KNIGHT_MACE_L = 24181;
public static final int VOID_KNIGHT_GLOVES_L = 24182;
public static final int VOID_MAGE_HELM_L = 24183;
public static final int VOID_RANGER_HELM_L = 24184;
public static final int VOID_MELEE_HELM_L = 24185;
public static final int AVERNIC_DEFENDER_L = 24186;
public static final int TROUVER_PARCHMENT = 24187;
public static final int DEADMANS_CHEST_24189 = 24189;
public static final int DEADMANS_LEGS_24190 = 24190;
public static final int DEADMANS_CAPE_24191 = 24191;
public static final int ARMADYL_HALO = 24192;
public static final int ARMADYL_HALO_L = 24194;
public static final int BANDOS_HALO = 24195;
public static final int BANDOS_HALO_L = 24197;
public static final int SEREN_HALO = 24198;
public static final int SEREN_HALO_L = 24200;
public static final int ANCIENT_HALO = 24201;
public static final int ANCIENT_HALO_L = 24203;
public static final int BRASSICA_HALO = 24204;
public static final int BRASSICA_HALO_L = 24206;
public static final int VICTORS_CAPE_1 = 24207;
public static final int VICTORS_CAPE_10 = 24209;
public static final int VICTORS_CAPE_50 = 24211;
public static final int VICTORS_CAPE_100 = 24213;
public static final int VICTORS_CAPE_500 = 24215;
public static final int GUTHIXIAN_ICON = 24217;
public static final int SWIFT_BLADE = 24219;
public static final int AVAS_ASSEMBLER_L = 24222;
public static final int FIRE_CAPE_L = 24223;
public static final int INFERNAL_CAPE_L = 24224;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+9 -9
View File
@@ -973,15 +973,15 @@ public final class NpcID
public static final int GUARD_1008 = 1008;
public static final int GUARD_1009 = 1009;
public static final int GERTRUDES_CAT = 1010;
public static final int GAMBLER = 1011;
public static final int GAMBLER_1012 = 1012;
public static final int GAMER = 1011;
public static final int GAMER_1012 = 1012;
public static final int BARMAN = 1013;
public static final int GAMBLER_1014 = 1014;
public static final int GAMBLER_1015 = 1015;
public static final int GAMBLER_1016 = 1016;
public static final int GAMBLER_1017 = 1017;
public static final int GAMBLER_1018 = 1018;
public static final int GAMBLER_1019 = 1019;
public static final int GAMER_1014 = 1014;
public static final int GAMER_1015 = 1015;
public static final int GAMER_1016 = 1016;
public static final int GAMER_1017 = 1017;
public static final int GAMER_1018 = 1018;
public static final int GAMER_1019 = 1019;
public static final int RAT = 1020;
public static final int RAT_1021 = 1021;
public static final int RAT_1022 = 1022;
@@ -3422,7 +3422,6 @@ public final class NpcID
public static final int SEAMAN_THRESNOR = 3646;
public static final int LUTHAS = 3647;
public static final int CUSTOMS_OFFICER = 3648;
public static final int CAPTAIN_BARNABY_3649 = 3649;
public static final int GARDENER_3651 = 3651;
public static final int MAN_3652 = 3652;
public static final int LUMBERJACK_LEIF = 3653;
@@ -8277,5 +8276,6 @@ public final class NpcID
public static final int ESSYLLT_HARD = 9247;
public static final int ARIANWYN_9248 = 9248;
public static final int ESSYLLT_9249 = 9249;
public static final int CAPTAIN_BARNABY_9250 = 9250;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+21
View File
@@ -12743,5 +12743,26 @@ public final class NullItemID
public static final int NULL_24126 = 24126;
public static final int NULL_24128 = 24128;
public static final int NULL_24129 = 24129;
public static final int NULL_24145 = 24145;
public static final int NULL_24146 = 24146;
public static final int NULL_24148 = 24148;
public static final int NULL_24150 = 24150;
public static final int NULL_24152 = 24152;
public static final int NULL_24154 = 24154;
public static final int NULL_24156 = 24156;
public static final int NULL_24188 = 24188;
public static final int NULL_24193 = 24193;
public static final int NULL_24196 = 24196;
public static final int NULL_24199 = 24199;
public static final int NULL_24202 = 24202;
public static final int NULL_24205 = 24205;
public static final int NULL_24208 = 24208;
public static final int NULL_24210 = 24210;
public static final int NULL_24212 = 24212;
public static final int NULL_24214 = 24214;
public static final int NULL_24216 = 24216;
public static final int NULL_24218 = 24218;
public static final int NULL_24220 = 24220;
public static final int NULL_24221 = 24221;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+2
View File
@@ -13780,6 +13780,8 @@ public final class NullObjectID
public static final int NULL_29058 = 29058;
public static final int NULL_29059 = 29059;
public static final int NULL_29060 = 29060;
public static final int NULL_29065 = 29065;
public static final int NULL_29068 = 29068;
public static final int NULL_29084 = 29084;
public static final int NULL_29086 = 29086;
public static final int NULL_29093 = 29093;
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+2 -2
View File
@@ -15273,10 +15273,8 @@ public final class ObjectID
public static final int LADDER_29062 = 29062;
public static final int REWARD_CHEST = 29063;
public static final int SCOREBOARD_29064 = 29064;
public static final int PLINTH_29065 = 29065;
public static final int DOOR_29066 = 29066;
public static final int DOOR_29067 = 29067;
public static final int DOOR_29068 = 29068;
public static final int CHEST_29069 = 29069;
public static final int CHEST_29070 = 29070;
public static final int CHEST_29071 = 29071;
@@ -19354,5 +19352,7 @@ public final class ObjectID
public static final int REPAIRED_LEAK = 37352;
public static final int BOOKS_37380 = 37380;
public static final int NOTICEBOARD_37381 = 37381;
public static final int SUPPLY_CHEST = 37382;
public static final int SUPPLY_CHEST_37383 = 37383;
/* This file is automatically generated. Do not edit. */
}
runelite-client/src/main/java/net/runelite/client/plugins/achievementdiary/diaries/WesternDiaryRequirement.java
+1 -1
View File
@@ -126,7 +126,7 @@ public class WesternDiaryRequirement extends GenericDiaryRequirement
new QuestRequirement(Quest.TREE_GNOME_VILLAGE));
// ELITE
add("Fletch a Magic Longbow in the Elven lands.",
add("Fletch a Magic Longbow in Tirannwn.",
new SkillRequirement(Skill.FLETCHING, 85),
new QuestRequirement(Quest.MOURNINGS_END_PART_I));
add("Kill the Thermonuclear Smoke devil (Does not require task).",
runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsConfig.java
+13 -5
View File
@@ -38,15 +38,23 @@ public interface BoostsConfig extends Config
NEVER
}
enum DisplayBoosts
{
NONE,
COMBAT,
NON_COMBAT,
BOTH
}
@ConfigItem(
keyName = "enableSkill",
name = "Enable Skill Boosts",
description = "Configures whether or not to display skill boost information",
keyName = "displayBoosts",
name = "Display Boosts",
description = "Configures which skill boosts to display",
position = 1
)
default boolean enableSkill()
default DisplayBoosts displayBoosts()
{
return true;
return DisplayBoosts.BOTH;
}
@ConfigItem(
runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
+19 -10
View File
@@ -110,7 +110,7 @@ public class BoostsPlugin extends Plugin
private long lastTickMillis;
private final List<String> boostedSkillsChanged = new ArrayList<>();
private boolean enableSkill;
private BoostsConfig.DisplayBoosts displayBoosts;
@Getter(AccessLevel.PACKAGE)
private boolean useRelativeBoost;
@Getter(AccessLevel.PACKAGE)
@@ -332,16 +332,25 @@ public class BoostsPlugin extends Plugin
private void updateShownSkills()
{
if (this.enableSkill)
switch (this.displayBoosts)
{
shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS);
case NONE:
shownSkills.removeAll(BOOSTABLE_COMBAT_SKILLS);
shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS);
break;
case COMBAT:
shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS);
shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS);
break;
case NON_COMBAT:
shownSkills.removeAll(BOOSTABLE_COMBAT_SKILLS);
shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS);
break;
case BOTH:
shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS);
shownSkills.addAll(BOOSTABLE_NON_COMBAT_SKILLS);
break;
}
else
{
shownSkills.removeAll(BOOSTABLE_NON_COMBAT_SKILLS);
}
shownSkills.addAll(BOOSTABLE_COMBAT_SKILLS);
}
private void updateBoostedStats()
@@ -448,7 +457,7 @@ public class BoostsPlugin extends Plugin
private void updateConfig()
{
this.enableSkill = config.enableSkill();
this.displayBoosts = config.displayBoosts();
this.useRelativeBoost = config.useRelativeBoost();
this.displayInfoboxes = config.displayInfoboxes();
this.displayIcons = config.displayIcons();
runelite-client/src/main/java/net/runelite/client/plugins/deathindicator/DeathIndicatorPlugin.java
+3 -1
View File
@@ -65,7 +65,9 @@ public class DeathIndicatorPlugin extends Plugin
12850, // Lumbridge
11828, // Falador
12342, // Edgeville
11062 // Camelot
11062, // Camelot
13150, // Prifddinas (it's possible to spawn in 2 adjacent regions)
12894 // Prifddinas
);
@Inject
runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java
+5 -1
View File
@@ -308,7 +308,11 @@ public class ExaminePlugin extends Plugin
return new int[]{widgetItem.getItemQuantity(), widgetItem.getItemId()};
}
}
else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup)
else if (WidgetInfo.BANK_ITEM_CONTAINER.getGroupId() == widgetGroup
|| WidgetInfo.CLUE_SCROLL_REWARD_ITEM_CONTAINER.getGroupId() == widgetGroup
|| WidgetInfo.LOOTING_BAG_CONTAINER.getGroupId() == widgetGroup
|| WidgetID.SEED_VAULT_INVENTORY_GROUP_ID == widgetGroup
|| WidgetID.SEED_BOX_GROUP_ID == widgetGroup)
{
Widget[] children = widget.getDynamicChildren();
if (actionParam < children.length)
runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/FixedPriceItem.java
+2
View File
@@ -94,6 +94,8 @@ enum FixedPriceItem
ROGUE_GLOVES(ItemID.ROGUE_GLOVES, 650),
ROGUE_BOOTS(ItemID.ROGUE_BOOTS, 650),
SALVE_AMULET_EI(ItemID.SALVE_AMULETEI, 209900),
RING_OF_WEALTH_1(ItemID.RING_OF_WEALTH_1, 500, ItemID.RING_OF_WEALTH),
RING_OF_WEALTH_2(ItemID.RING_OF_WEALTH_2, 1000, ItemID.RING_OF_WEALTH),
RING_OF_WEALTH_3(ItemID.RING_OF_WEALTH_3, 1500, ItemID.RING_OF_WEALTH),
runelite-client/src/main/resources/item_variations.json
+124 -36
View File
@@ -3435,7 +3435,8 @@
4068,
4503,
4508,
20483
20483,
24157
],
"decorative armour": [
4069,
@@ -3462,19 +3463,30 @@
20499,
20501,
20503,
20505
20505,
24158,
24159,
24162,
24163,
24164,
24165,
24166,
24167,
24168
],
"decorative helm": [
4071,
4506,
4511,
20489
20489,
24160
],
"decorative shield": [
4072,
4507,
4512,
20491
20491,
24161
],
"yoyo": [
4079,
@@ -4835,7 +4847,8 @@
6570,
10566,
10637,
20445
20445,
24223
],
"onyx amulet": [
6579,
@@ -6189,48 +6202,59 @@
"void knight top": [
8839,
10611,
20465
20465,
24177
],
"void knight robe": [
8840,
20469
20469,
24179
],
"void knight mace": [
8841,
20473
20473,
24181
],
"void knight gloves": [
8842,
20475
20475,
24182
],
"bronze defender": [
8844,
20449
20449,
24136
],
"iron defender": [
8845,
20451
20451,
24137
],
"steel defender": [
8846,
20453
20453,
24138
],
"black defender": [
8847,
20455
20455,
24139
],
"mithril defender": [
8848,
20457
20457,
24140
],
"adamant defender": [
8849,
20459
20459,
24141
],
"rune defender": [
8850,
20461,
23230
23230,
24142
],
"zanik": [
8870,
@@ -6950,19 +6974,23 @@
],
"healer hat": [
10547,
20511
20511,
24172
],
"fighter hat": [
10548,
20507
20507,
24173
],
"ranger hat": [
10550,
20509
20509,
24174
],
"fighter torso": [
10551,
20513
20513,
24175
],
"penance gloves": [
10553,
@@ -6970,7 +6998,8 @@
],
"penance skirt": [
10555,
20515
20515,
24176
],
"attacker icon": [
10556,
@@ -7465,17 +7494,20 @@
"void mage helm": [
11663,
11674,
20477
20477,
24183
],
"void ranger helm": [
11664,
11675,
20479
20479,
24184
],
"void melee helm": [
11665,
11676,
20481
20481,
24185
],
"void seal": [
11666,
@@ -7824,15 +7856,18 @@
],
"saradomin halo": [
12637,
20537
20537,
24169
],
"zamorak halo": [
12638,
20539
20539,
24170
],
"guthix halo": [
12639,
20541
20541,
24171
],
"kalphite princess": [
12647,
@@ -8014,7 +8049,8 @@
12954,
19722,
20463,
23597
23597,
24143
],
"bronze set": [
12960,
@@ -8126,11 +8162,13 @@
],
"elite void top": [
13072,
20467
20467,
24178
],
"elite void robe": [
13073,
20471
20471,
24180
],
"crystal halberd": [
13080,
@@ -8207,6 +8245,18 @@
13305,
13306
],
"deadmans chest": [
13317,
24189
],
"deadmans legs": [
13318,
24190
],
"deadmans cape": [
13319,
24191
],
"rock golem": [
13321,
21187,
@@ -8234,7 +8284,8 @@
"fire max cape": [
13329,
20447,
21186
21186,
24134
],
"vial of tears": [
13347,
@@ -8781,13 +8832,15 @@
"infernal max cape": [
21284,
21285,
21289
21289,
24133
],
"infernal cape": [
21287,
21295,
21297,
23622
23622,
24224
],
"amethyst javelin": [
21318,
@@ -8912,7 +8965,8 @@
],
"assembler max cape": [
21898,
21916
21916,
24135
],
"dragon crossbow": [
21902,
@@ -8931,7 +8985,8 @@
],
"avas assembler": [
21914,
22109
22109,
24222
],
"opal dragon bolts": [
21932,
@@ -9078,7 +9133,8 @@
],
"avernic defender": [
22322,
22441
22441,
24186
],
"sanguinesti staff": [
22323,
@@ -9423,5 +9479,37 @@
24031,
24032,
24033
],
"armadyl halo": [
24147,
24192,
24194
],
"bandos halo": [
24149,
24195,
24197
],
"seren halo": [
24151,
24198,
24200
],
"ancient halo": [
24153,
24201,
24203
],
"brassica halo": [
24155,
24204,
24206
],
"victors cape": [
24207,
24209,
24211,
24213,
24215
]
}
runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java
+3
View File
@@ -159,6 +159,9 @@ public class ItemsKeptOnDeathPluginTest
final Item brace = mItem(ItemID.COMBAT_BRACELET1, 1, "Combat bracelet(1)", true, 0);
final int braceletOffset = FixedPriceItem.COMBAT_BRACELET1.getOffset();
assertEquals(13500 + braceletOffset, plugin.getDeathPrice(brace));
final Item amulet = mItem(ItemID.SALVE_AMULETEI, 1, "Salve Amulet(ei)", false, 300);
assertEquals(210200, plugin.getDeathPrice(amulet));
}
@Test