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

Merge remote-tracking branch 'orig_upstream/master' into ext

Browse Source
This commit is contained in:
Lucas
2019-04-25 14:32:16 +02:00
parent 5c6949231e 6f6832df7e
commit 5b77d64b9c
26 changed files with 990 additions and 997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java
View File

@@ -291,7 +291,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc
new CrypticClue("A chisel and hammer reside in his home, strange for one of magic. Impress him with your magical equipment.", "Wizard Cromperty", new WorldPoint(2682, 3325, 0), "Wizard Cromperty, NE corner of East Ardougne. +100 magic attack bonus needed"),
new CrypticClue("You have all of the elements available to solve this clue. Fortunately you do not have to go as far as to stand in a draft.", CRATE_18506, new WorldPoint(2723, 9891, 0), "Search the crate, west of the Air Elementals, inside the Elemental Workshop."),
new CrypticClue("A demon's best friend holds the next step of this clue.", null, "Kill a hellhound."),
new CrypticClue("Dig in the centre of a great city of 5 districts.", new WorldPoint(1639, 3673, 0), "Dig in front of the large statue in the centre of Great Kourend."),
new CrypticClue("Dig in the centre of a great kingdom of 5 cities.", new WorldPoint(1639, 3673, 0), "Dig in front of the large statue in the centre of Great Kourend."),
new CrypticClue("Hopefully this set of armour will help you to keep surviving.", "Sir Vyvin", new WorldPoint(2982, 3336, 2), "Speak to Sir Vyvin while wearing a white platebody, and platelegs."),
new CrypticClue("The beasts retreat, for their Queen is gone; the song of this town still plays on. Dig near the birthplace of a blade, be careful not to melt your spade.", new WorldPoint(2342, 3677, 0), "Dig in front of the small furnace in the Piscatoris Fishing Colony."),
new CrypticClue("Darkness wanders around me, but fills my mind with knowledge.", "Biblia", new WorldPoint(1633, 3825, 2), "Speak to Biblia on the Arceuus House Library's top floor."),

2
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
View File

@@ -170,7 +170,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
new EmoteClue("Swing a bullroarer at the top of the watchtower. Beware of double agents! Equip a dragon plateskirt, climbing boots and a dragon chainbody.", TOP_FLOOR_OF_THE_YANILLE_WATCHTOWER, new WorldPoint(2932, 4712, 0), BULL_ROARER, item(DRAGON_PLATESKIRT), item(CLIMBING_BOOTS), item(DRAGON_CHAINBODY_3140), item(ItemID.BULL_ROARER)),
new EmoteClue("Blow a raspberry at Gypsy Aris in her tent. Equip a gold ring and a gold necklace.", GYPSY_TENT_ENTRANCE, new WorldPoint(3203, 3424, 0), RASPBERRY, item(GOLD_RING), item(GOLD_NECKLACE)),
new EmoteClue("Bow to Brugsen Bursen at the Grand Exchange.", null, new WorldPoint(3164, 3477, 0), BOW),
new EmoteClue("Cheer at Iffie Nitter. Equip a chef's hat and a red cape.", FINE_CLOTHES_ENTRANCE, new WorldPoint(3205, 3416, 0), CHEER, item(CHEFS_HAT), item(RED_CAPE)),
new EmoteClue("Cheer at Iffie Nitter. Equip a chef hat and a red cape.", FINE_CLOTHES_ENTRANCE, new WorldPoint(3205, 3416, 0), CHEER, item(CHEFS_HAT), item(RED_CAPE)),
new EmoteClue("Clap at Bob's Brilliant Axes. Equip a bronze axe and leather boots.", BOB_AXES_ENTRANCE, new WorldPoint(3231, 3203, 0), CLAP, item(BRONZE_AXE), item(LEATHER_BOOTS)),
new EmoteClue("Panic at Al Kharid mine.", null, new WorldPoint(3300, 3314, 0), PANIC),
new EmoteClue("Spin at Flynn's Mace Shop.", null, new WorldPoint(2950, 3387, 0), SPIN));

3
runelite-client/src/main/resources/item_variations.json
View File

@@ -6279,8 +6279,7 @@
],
"kindling": [
9094,
20799,
22350
20799
],
"lunar helm": [
9096,

2
runelite-client/src/main/scripts/BankSearchLayout.hash
View File

@@ -1 +1 @@
81FBDB7DE85B5B435E3DB440EE220AC3BF1AB8A3F91C2DE280894E232F62F793
EE35EDE5A14C6D9934C329F6921548C6E7C34810C0D441ECEE130276A38809EA

953
runelite-client/src/main/scripts/BankSearchLayout.rs2asm
View File

File diff suppressed because it is too large Load Diff

2
runelite-client/src/main/scripts/TriggerBankLayout.hash
View File

@@ -1 +1 @@
A5E68A8B5B344D82FAF2CC11FE88D43A150A60094C93E6C52DC5CDCB0BF576D0
DC2D875DFF91D7D0184670EC9CD4E5980C051D8D4BD0F591935FD603409A7369

8
runelite-client/src/main/scripts/TriggerBankLayout.rs2asm
View File

@@ -1,7 +1,7 @@
.id 276
.int_stack_count 13
.int_stack_count 17
.string_stack_count 0
.int_var_count 13
.int_var_count 17
.string_var_count 0
; Check if we should allow server to relayout bank
@@ -38,5 +38,9 @@ LABEL2:
iload 10
iload 11
iload 12
iload 13
iload 14
iload 15
iload 16
invoke 277
return