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

Merge remote-tracking branch 'upstream/master' into master

Browse Source
This commit is contained in:
ThatGamerBlue
2021-04-28 13:44:43 +01:00
parent 532edebb8f 848a54c181
commit 21c642a905
26 changed files with 449 additions and 463 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

@@ -298,7 +298,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc
new CrypticClue("I would make a chemistry joke, but I'm afraid I wouldn't get a reaction.", "Chemist", new WorldPoint(2932, 3212, 0), "Talk to the Chemist in Rimmington"),
new CrypticClue("Show this to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Located upstairs in the house east of Yanille, north of fairy ring CLS."),
new CrypticClue("Does one really need a fire to stay warm here?", new WorldPoint(3816, 3810, 0), "Dig next to the fire near the Volcanic Mine entrance on Fossil Island."),
new CrypticClue("Search the open crate found in the Hosidius kitchens.", CRATE_27533, new WorldPoint(1683, 3616, 0), "The kitchens are north-west of the town in Hosidius."),
new CrypticClue("Search the open crate found in the Hosidius kitchens.", CRATES_27533, new WorldPoint(1683, 3616, 0), "The kitchens are north-west of the town in Hosidius."),
new CrypticClue("Dig under Ithoi's cabin.", new WorldPoint(2529, 2838, 0), "Dig under Ithoi's cabin in the Corsair Cove."),
new CrypticClue("Search the drawers, upstairs in the bank to the East of Varrock.", DRAWERS_7194, new WorldPoint(3250, 3420, 1), "Search the drawers upstairs in Varrock east bank."),
new CrypticClue("Speak to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Located upstairs in the house east of Yanille, north of fairy ring CLS. Answer: 6859", "What is 19 to the power of 3?"),

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

@@ -201,7 +201,7 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll, Nam
any("", item(ItemID.ANGLER_BOOTS), item(ItemID.SPIRIT_ANGLER_BOOTS)))),
new SkillChallengeClue("Chop a redwood log.", "chop a redwood log whilst sporting the finest lumberjack gear.", true, ANY_AXE, all("Lumberjack outfit", item(ItemID.LUMBERJACK_HAT), item(ItemID.LUMBERJACK_TOP), item(ItemID.LUMBERJACK_LEGS), item(ItemID.LUMBERJACK_BOOTS))),
new SkillChallengeClue("Craft a light orb in the Dorgesh-Kaan bank.", item(ItemID.CAVE_GOBLIN_WIRE), item(ItemID.EMPTY_LIGHT_ORB)),
new SkillChallengeClue("Kill a reanimated Abyssal Demon.", "kill a reanimated abyssal.", xOfItem(ItemID.SOUL_RUNE, 4), xOfItem(ItemID.BLOOD_RUNE, 1), any("Nature Rune x4", xOfItem(ItemID.NATURE_RUNE, 4), item(ItemID.BRYOPHYTAS_STAFF)), range("Ensouled abyssal head", ItemID.ENSOULED_ABYSSAL_HEAD, ItemID.ENSOULED_ABYSSAL_HEAD_13508)),
new SkillChallengeClue("Kill a reanimated Abyssal Demon.", "kill a reanimated abyssal.", xOfItem(ItemID.SOUL_RUNE, 4), xOfItem(ItemID.BLOOD_RUNE, 2), any("Nature Rune x4", xOfItem(ItemID.NATURE_RUNE, 4), item(ItemID.BRYOPHYTAS_STAFF)), range("Ensouled abyssal head", ItemID.ENSOULED_ABYSSAL_HEAD, ItemID.ENSOULED_ABYSSAL_HEAD_13508)),
new SkillChallengeClue("Kill a Fiyr shade inside Mort'tons shade catacombs.", any("Any Silver Shade Key", item(ItemID.SILVER_KEY_RED), item(ItemID.SILVER_KEY_BROWN), item(ItemID.SILVER_KEY_CRIMSON), item(ItemID.SILVER_KEY_BLACK), item(ItemID.SILVER_KEY_PURPLE)))
);

2
runelite-client/src/main/java/net/runelite/client/plugins/itemidentification/ItemIdentification.java
View File

@@ -340,7 +340,7 @@ enum ItemIdentification
PADDEWWA_TELEPORT(Type.TABLET, "Paddew", "PDW", ItemID.PADDEWWA_TELEPORT),
SENNTISTEN_TELEPORT(Type.TABLET, "Sennt", "SNT", ItemID.SENNTISTEN_TELEPORT),
LUMBRIDGE_GRAVEYARD_TELEPORT(Type.TABLET, "L.Grave", "L.GRV", ItemID.LUMBRIDGE_GRAVEYARD_TELEPORT),
ARCEUUS_LIBRARY_TELEPORT(Type.TABLET, "Arc.Lib", "A.LIB", ItemID.ARCEUUS_LIBRARY_TELEPORT),
DRAYNOR_MANOR_TELEPORT(Type.TABLET, "D.Manor", "D.MNR", ItemID.DRAYNOR_MANOR_TELEPORT),
MIND_ALTAR_TELEPORT(Type.TABLET, "M.Altar", "M.ALT", ItemID.MIND_ALTAR_TELEPORT),
SALVE_GRAVEYARD_TELEPORT(Type.TABLET, "S.Grave", "S.GRV", ItemID.SALVE_GRAVEYARD_TELEPORT),

2
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -312,7 +312,7 @@ public class MenuEntrySwapperPlugin extends Plugin
Arrays.asList(
"annakarl", "ape atoll dungeon", "ardougne", "barrows", "battlefront", "camelot", "carrallangar",
"catherby", "cemetery", "draynor manor", "falador", "fenkenstrain's castle", "fishing guild", "ghorrock",
"grand exchange", "great kourend", "harmony island", "kharyrll", "lumbridge", "lumbridge graveyard",
"grand exchange", "great kourend", "harmony island", "kharyrll", "lumbridge", "arceuus library",
"lunar isle", "marim", "mind altar", "salve graveyard", "seers' village", "senntisten", "troll stronghold",
"varrock", "watchtower", "waterbirth island", "weiss", "west ardougne", "yanille"
).forEach(location -> swap(location, "portal nexus", "teleport menu", config::swapPortalNexus));

10
runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java
View File

@@ -61,7 +61,7 @@ public enum PohIcons
DRAYNORMANOR("draynormanor", DRAYNOR_MANOR_PORTAL, DRAYNOR_MANOR_PORTAL_37595, DRAYNOR_MANOR_PORTAL_37607),
FENKENSTRAINSCASTLE("fenkenstrainscastle", FENKENSTRAINS_CASTLE_PORTAL, FENKENSTRAINS_CASTLE_PORTAL_37599, FENKENSTRAINS_CASTLE_PORTAL_37611),
HARMONYISLAND("harmonyisland", HARMONY_ISLAND_PORTAL, HARMONY_ISLAND_PORTAL_37601, HARMONY_ISLAND_PORTAL_37613),
LUMBRIDGEGRAVEYARD("lumbridgegraveyard", LUMBRIDGE_GRAVEYARD_PORTAL, LUMBRIDGE_GRAVEYARD_PORTAL_37594, LUMBRIDGE_GRAVEYARD_PORTAL_37606),
ARCEUUSLIBRARY("arceuuslibrary", ARCEUUS_LIBRARY_PORTAL, ARCEUUS_LIBRARY_PORTAL_41417, ARCEUUS_LIBRARY_PORTAL_41418),
MINDALTAR("mindaltar", MIND_ALTAR_PORTAL, MIND_ALTAR_PORTAL_37597, MIND_ALTAR_PORTAL_37609),
SALVEGRAVEYARD("salvegraveyard", SALVE_GRAVEYARD_PORTAL, SALVE_GRAVEYARD_PORTAL_37598, SALVE_GRAVEYARD_PORTAL_37610),
WESTARDOUGNE("westardougne", WEST_ARDOUGNE_PORTAL, WEST_ARDOUGNE_PORTAL_37600, WEST_ARDOUGNE_PORTAL_37612),
@@ -88,10 +88,10 @@ public enum PohIcons
PORTAL_NEXUS_33410, PORTAL_NEXUS_33423, PORTAL_NEXUS_33424, PORTAL_NEXUS_33425, PORTAL_NEXUS_33426, PORTAL_NEXUS_33427, PORTAL_NEXUS_33428,
PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431, PORTAL_NEXUS_37547, PORTAL_NEXUS_37548, PORTAL_NEXUS_37549, PORTAL_NEXUS_37550,
PORTAL_NEXUS_37551, PORTAL_NEXUS_37552, PORTAL_NEXUS_37553, PORTAL_NEXUS_37554, PORTAL_NEXUS_37555, PORTAL_NEXUS_37556, PORTAL_NEXUS_37557,
PORTAL_NEXUS_37558, PORTAL_NEXUS_37559, PORTAL_NEXUS_37560, PORTAL_NEXUS_37561, PORTAL_NEXUS_37562, PORTAL_NEXUS_37563, PORTAL_NEXUS_37564,
PORTAL_NEXUS_37565, PORTAL_NEXUS_37566, PORTAL_NEXUS_37567, PORTAL_NEXUS_37568, PORTAL_NEXUS_37569, PORTAL_NEXUS_37570, PORTAL_NEXUS_37571,
PORTAL_NEXUS_37572, PORTAL_NEXUS_37573, PORTAL_NEXUS_37574, PORTAL_NEXUS_37575, PORTAL_NEXUS_37576, PORTAL_NEXUS_37577, PORTAL_NEXUS_37578,
PORTAL_NEXUS_37579, PORTAL_NEXUS_37580
PORTAL_NEXUS_37559, PORTAL_NEXUS_37560, PORTAL_NEXUS_37561, PORTAL_NEXUS_37562, PORTAL_NEXUS_37563, PORTAL_NEXUS_37564, PORTAL_NEXUS_37565,
PORTAL_NEXUS_37566, PORTAL_NEXUS_37567, PORTAL_NEXUS_37568, PORTAL_NEXUS_37569, PORTAL_NEXUS_37571, PORTAL_NEXUS_37572, PORTAL_NEXUS_37573,
PORTAL_NEXUS_37574, PORTAL_NEXUS_37575, PORTAL_NEXUS_37576, PORTAL_NEXUS_37577, PORTAL_NEXUS_37578, PORTAL_NEXUS_37579, PORTAL_NEXUS_37580,
PORTAL_NEXUS_41413, PORTAL_NEXUS_41414, PORTAL_NEXUS_41415
),
XERICSTALISMAN("xericstalisman",
XERICS_TALISMAN, XERICS_TALISMAN_33412, XERICS_TALISMAN_33413, XERICS_TALISMAN_33414, XERICS_TALISMAN_33415, XERICS_TALISMAN_33419

2
runelite-client/src/main/java/net/runelite/client/plugins/poh/PohOverlay.java
View File

@@ -46,7 +46,7 @@ public class PohOverlay extends Overlay
PohIcons.SENNTISTEN, PohIcons.KHARYLL, PohIcons.ANNAKARL, PohIcons.KOUREND, PohIcons.MARIM,
PohIcons.TROLLSTRONGHOLD, PohIcons.CARRALLANGAR, PohIcons.CATHERBY, PohIcons.WEISS, PohIcons.GHORROCK,
PohIcons.APEATOLLDUNGEON, PohIcons.BARROWS, PohIcons.BATTLEFRONT, PohIcons.CEMETERY, PohIcons.DRAYNORMANOR,
PohIcons.FENKENSTRAINSCASTLE, PohIcons.HARMONYISLAND, PohIcons.LUMBRIDGEGRAVEYARD, PohIcons.MINDALTAR, PohIcons.SALVEGRAVEYARD,
PohIcons.FENKENSTRAINSCASTLE, PohIcons.HARMONYISLAND, PohIcons.ARCEUUSLIBRARY, PohIcons.MINDALTAR, PohIcons.SALVEGRAVEYARD,
PohIcons.WESTARDOUGNE,
};

2
runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportLocationData.java
View File

@@ -59,7 +59,7 @@ enum TeleportLocationData
FISHING_GUILD(TeleportType.LUNAR_MAGIC, "Fishing Guild", 85, new WorldPoint(2612, 3391, 0), "fishing_guild_teleport_icon.png"),
CATHERBY(TeleportType.LUNAR_MAGIC, "Catherby", 87, new WorldPoint(2802, 3449, 0), "catherby_teleport_icon.png"),
ICE_PLATEAU(TeleportType.LUNAR_MAGIC, "Ice Plateau", 89, new WorldPoint(2973, 3939, 0), "ice_plateau_teleport_icon.png"),
LUMBRIDGE_GRAVEYARD(TeleportType.ARCEUUS_MAGIC, "Lumbridge Graveyard", 6, new WorldPoint(3241, 3194, 0), "lumbridge_graveyard_teleport_icon.png"),
ARCEUUS_LIBRARY(TeleportType.ARCEUUS_MAGIC, "Arceuus Library", 6, new WorldPoint(1632, 3838, 0), "arceuus_library_teleport_icon_arceuus.png"),
DRAYNOR_MANOR(TeleportType.ARCEUUS_MAGIC, "Draynor Manor", 17, new WorldPoint(3108, 3352, 0), "draynor_manor_teleport_icon.png"),
BATTLEFRONT(TeleportType.ARCEUUS_MAGIC, "Battlefront", 23, new WorldPoint(1349, 3739, 0), "battlefront_teleport_icon.png"),
MIND_ALTAR(TeleportType.ARCEUUS_MAGIC, "Mind Altar", 28, new WorldPoint(2979, 3509, 0), "mind_altar_teleport_icon.png"),

BIN
runelite-client/src/main/resources/net/runelite/client/plugins/poh/arceuuslibrary.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 268 B

BIN
runelite-client/src/main/resources/net/runelite/client/plugins/poh/lumbridgegraveyard.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 259 B

174
runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_magic.json
View File

@@ -6,12 +6,6 @@
"name": "Wind Strike",
"xp": 5.5
},
{
"level": 3,
"sprite": 1247,
"name": "Reanimate Goblin",
"xp": 6
},
{
"level": 3,
"sprite": 16,
@@ -32,8 +26,8 @@
},
{
"level": 6,
"sprite": 1269,
"name": "Lumbridge Graveyard Teleport",
"sprite": 1252,
"name": "Arceuus Library Teleport",
"xp": 10
},
{
@@ -48,12 +42,6 @@
"name": "Enchant Sapphire Bolt",
"xp": 17.5
},
{
"level": 7,
"sprite": 1264,
"name": "Reanimate Monkey",
"xp": 14
},
{
"level": 9,
"sprite": 19,
@@ -66,12 +54,6 @@
"name": "Weaken",
"xp": 21
},
{
"level": 12,
"sprite": 1258,
"name": "Reanimate Imp",
"xp": 24
},
{
"level": 13,
"sprite": 21,
@@ -92,13 +74,13 @@
},
{
"level": 16,
"sprite": 1259,
"name": "Reanimate Minotaur",
"sprite": 1247,
"name": "Basic Reanimation",
"xp": 32
},
{
"level": 17,
"sprite": 1269,
"sprite": 1253,
"name": "Draynor Manor Teleport",
"xp": 16
},
@@ -108,12 +90,6 @@
"name": "Wind Bolt",
"xp": 13.5
},
{
"level": 19,
"sprite": 1257,
"name": "Reanimate Scorpion",
"xp": 38
},
{
"level": 19,
"sprite": 24,
@@ -132,18 +108,6 @@
"name": "Low Level Alchemy",
"xp": 31
},
{
"level": 21,
"sprite": 1256,
"name": "Reanimate Bear",
"xp": 42
},
{
"level": 22,
"sprite": 1260,
"name": "Reanimate Unicorn",
"xp": 44
},
{
"level": 23,
"sprite": 26,
@@ -162,12 +126,6 @@
"name": "Varrock Teleport",
"xp": 35
},
{
"level": 26,
"sprite": 1268,
"name": "Reanimate Dog",
"xp": 52
},
{
"level": 27,
"sprite": 28,
@@ -182,7 +140,7 @@
},
{
"level": 28,
"sprite": 1271,
"sprite": 1256,
"name": "Mind Altar Teleport",
"xp": 22
},
@@ -198,12 +156,6 @@
"name": "Earth Bolt",
"xp": 19.5
},
{
"level": 30,
"sprite": 1251,
"name": "Reanimate Chaos Druid",
"xp": 60
},
{
"level": 31,
"sprite": 30,
@@ -218,7 +170,7 @@
},
{
"level": 34,
"sprite": 1300,
"sprite": 1257,
"name": "Respawn Teleport",
"xp": 27
},
@@ -228,12 +180,6 @@
"name": "Fire Bolt",
"xp": 22.5
},
{
"level": 37,
"sprite": 1255,
"name": "Reanimate Giant",
"xp": 74
},
{
"level": 37,
"sprite": 33,
@@ -248,22 +194,22 @@
},
{
"level": 40,
"sprite": 1301,
"sprite": 1254,
"name": "Salve Graveyard Teleport",
"xp": 30
},
{
"level": 40,
"sprite": 1254,
"name": "Reanimate Ogre",
"xp": 80
},
{
"level": 40,
"sprite": 355,
"name": "Teleport To House",
"xp": 30
},
{
"level": 41,
"sprite": 1248,
"name": "Adept Reanimation",
"xp": 80
},
{
"level": 41,
"sprite": 35,
@@ -276,24 +222,12 @@
"name": "Superheat Item",
"xp": 53
},
{
"level": 43,
"sprite": 1250,
"name": "Reanimate Elf",
"xp": 86
},
{
"level": 45,
"sprite": 37,
"name": "Camelot Teleport",
"xp": 55.5
},
{
"level": 46,
"sprite": 1252,
"name": "Reanimate Troll",
"xp": 92
},
{
"level": 47,
"sprite": 38,
@@ -302,7 +236,7 @@
},
{
"level": 48,
"sprite": 1302,
"sprite": 1259,
"name": "Fenkenstrain's Castle Teleport",
"xp": 50
},
@@ -348,12 +282,6 @@
"name": "Ardougne Teleport",
"xp": 61
},
{
"level": 52,
"sprite": 1266,
"name": "Reanimate Horror",
"xp": 104
},
{
"level": 52,
"sprite": 337,
@@ -402,12 +330,6 @@
"name": "Enchant Diamond Jewellery",
"xp": 67
},
{
"level": 57,
"sprite": 1261,
"name": "Reanimate Kalphite",
"xp": 114
},
{
"level": 58,
"sprite": 55,
@@ -464,7 +386,7 @@
},
{
"level": 61,
"sprite": 1303,
"sprite": 1260,
"name": "West Ardougne Teleport",
"xp": 68
},
@@ -474,12 +396,6 @@
"name": "Trollheim Teleport",
"xp": 68
},
{
"level": 62,
"sprite": 1253,
"name": "Reanimate Dagannoth",
"xp": 124
},
{
"level": 62,
"sprite": 330,
@@ -518,16 +434,10 @@
},
{
"level": 65,
"sprite": 1304,
"sprite": 1261,
"name": "Harmony Island Teleport",
"xp": 74
},
{
"level": 65,
"sprite": 1267,
"name": "Reanimate Bloodveld",
"xp": 130
},
{
"level": 65,
"sprite": 563,
@@ -612,12 +522,6 @@
"name": "Moonclan Teleport",
"xp": 66
},
{
"level": 69,
"sprite": 1262,
"name": "Reanimate Tzhaar",
"xp": 138
},
{
"level": 70,
"sprite": 51,
@@ -644,7 +548,7 @@
},
{
"level": 71,
"sprite": 1305,
"sprite": 1264,
"name": "Cemetery Teleport",
"xp": 82
},
@@ -662,15 +566,15 @@
},
{
"level": 72,
"sprite": 344,
"name": "Lassar Teleport",
"xp": 82
"sprite": 1249,
"name": "Expert Reanimation",
"xp": 138
},
{
"level": 72,
"sprite": 1248,
"name": "Reanimate Demon",
"xp": 144
"sprite": 344,
"name": "Lassar Teleport",
"xp": 82
},
{
"level": 72,
@@ -770,16 +674,10 @@
},
{
"level": 78,
"sprite": 1308,
"sprite": 1266,
"name": "Resurrect Crops",
"xp": 90
},
{
"level": 78,
"sprite": 1263,
"name": "Reanimate Aviansie",
"xp": 156
},
{
"level": 79,
"sprite": 321,
@@ -860,7 +758,7 @@
},
{
"level": 83,
"sprite": 1306,
"sprite": 1262,
"name": "Barrows Teleport",
"xp": 90
},
@@ -876,12 +774,6 @@
"name": "Boost Potion Share",
"xp": 88
},
{
"level": 85,
"sprite": 1265,
"name": "Reanimate Abyssal Creature",
"xp": 170
},
{
"level": 85,
"sprite": 363,
@@ -978,6 +870,12 @@
"name": "Earth Surge",
"xp": 48
},
{
"level": 90,
"sprite": 1250,
"name": "Master Reanimation",
"xp": 170
},
{
"level": 90,
"sprite": 575,
@@ -992,7 +890,7 @@
},
{
"level": 90,
"sprite": 1307,
"sprite": 1263,
"name": "Ape Atoll Teleport",
"xp": 100
},
@@ -1026,12 +924,6 @@
"name": "Enchant Zenyte Jewellery",
"xp": 110
},
{
"level": 93,
"sprite": 1249,
"name": "Reanimate Dragon",
"xp": 186
},
{
"level": 94,
"sprite": 328,

BIN
runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/arceuus_library_teleport_icon_arceuus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 268 B

BIN
runelite-client/src/main/resources/net/runelite/client/plugins/worldmap/lumbridge_graveyard_teleport_icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 259 B

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

@@ -1 +1 @@
91023012B55ED61B5DA93FAD2CB6A92EBB9AA8C8633AC5AC6FB337C2AFC6365F
1D8F698FFDA4B0D72798938A0EFB4D7F58988E9AF3FA706A7CD9402FE14E201C

65
runelite-client/src/main/scripts/LayoutResizableStones.rs2asm
View File

@@ -18,7 +18,7 @@
1129: LABEL109
1130: LABEL87
1131: LABEL9
jump LABEL201
jump LABEL204
LABEL9:
iconst 10747939
if_getwidth
@@ -107,7 +107,7 @@ LABEL77:
LABEL84:
clientclock
set_varc_int 384
jump LABEL201
jump LABEL204
LABEL87:
get_varbit 4084
iconst 1
@@ -133,7 +133,7 @@ LABEL99:
LABEL106:
clientclock
set_varc_int 384
jump LABEL201
jump LABEL204
LABEL109:
invoke 3297
iconst 1
@@ -157,18 +157,21 @@ LABEL121:
enum
2122
LABEL128:
jump LABEL201
jump LABEL204
LABEL129:
get_varbit 6257
iconst 1
if_icmpeq LABEL133
jump LABEL137
LABEL133:
if_icmpeq LABEL136
get_varbit 542
iconst 1
if_icmpeq LABEL136
jump LABEL140
LABEL136:
iconst 1
iconst 39387169
if_sethide
jump LABEL192
LABEL137:
jump LABEL195
LABEL140:
iconst 0
iconst 39387169
if_sethide
@@ -177,11 +180,11 @@ LABEL137:
2308
get_varbit 6255
switch
1: LABEL154
2: LABEL146
3: LABEL162
jump LABEL170
LABEL146:
1: LABEL157
2: LABEL149
3: LABEL165
jump LABEL173
LABEL149:
iconst 1718
iconst 39387171
if_setgraphic
@@ -189,8 +192,8 @@ LABEL146:
sconst "Toggle single-tap mode"
iconst 39387169
if_setop
jump LABEL177
LABEL154:
jump LABEL180
LABEL157:
iconst 1717
iconst 39387171
if_setgraphic
@@ -198,8 +201,8 @@ LABEL154:
sconst "Toggle tap-to-drop mode"
iconst 39387169
if_setop
jump LABEL177
LABEL162:
jump LABEL180
LABEL165:
iconst 1716
iconst 39387171
if_setgraphic
@@ -207,8 +210,8 @@ LABEL162:
sconst "Show Keyboard"
iconst 39387169
if_setop
jump LABEL177
LABEL170:
jump LABEL180
LABEL173:
iconst 1715
iconst 39387171
if_setgraphic
@@ -216,26 +219,26 @@ LABEL170:
sconst ""
iconst 39387169
if_setop
LABEL177:
LABEL180:
get_varbit 6255
iconst 3
if_icmpne LABEL181
jump LABEL189
LABEL181:
if_icmpne LABEL184
jump LABEL192
LABEL184:
get_varbit 6256
iconst 0
if_icmpeq LABEL185
jump LABEL189
LABEL185:
if_icmpeq LABEL188
jump LABEL192
LABEL188:
iconst 155
iconst 39387171
if_settrans
jump LABEL192
LABEL189:
jump LABEL195
LABEL192:
iconst 0
iconst 39387171
if_settrans
LABEL192:
LABEL195:
invoke 2581
get_varbit 6254
invoke 633
@@ -245,5 +248,5 @@ LABEL192:
pop_int
clientclock
set_varc_int 384
LABEL201:
LABEL204:
return

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

@@ -1 +1 @@
1CCC672616971AEB7A1E4C00885367CEFC75A873DD22A37BE99652F2DA107653
F62F3A22CA5AEAECCEFAA3A9EEDA095D778CC8BE08CD15CC4ECDC91159924746

264
runelite-client/src/main/scripts/OptionsPanelRebuilder.rs2asm
View File

@@ -92,7 +92,7 @@ LABEL84:
get_varbit 4606
iconst 0
if_icmpne LABEL88
jump LABEL253
jump LABEL279
LABEL88:
get_varbit 4606
iconst 2
@@ -107,26 +107,57 @@ LABEL92:
iconst 0
iconst 0
viewport_clampfov
jump LABEL106
jump LABEL132
LABEL101:
get_varbit 4606
iconst 3
if_icmpeq LABEL105
jump LABEL124
LABEL105:
iconst 256
iconst 256
viewport_setfov
iload 1
iconst 1129
if_icmpeq LABEL112
jump LABEL118
LABEL112:
iconst 512
iconst 512
iconst 512
iconst 512
viewport_clampfov
LABEL106:
jump LABEL123
LABEL118:
iconst 640
iconst 768
iconst 512
iconst 512
viewport_clampfov
LABEL123:
jump LABEL132
LABEL124:
iconst 256
iconst 256
viewport_setfov
iconst 512
iconst 512
iconst 512
iconst 512
viewport_clampfov
LABEL132:
iconst 50
cam_setfollowheight
iload 2
iconst -1
if_icmpne LABEL112
jump LABEL252
LABEL112:
if_icmpne LABEL138
jump LABEL278
LABEL138:
iload 3
iconst -1
if_icmpne LABEL116
jump LABEL252
LABEL116:
if_icmpne LABEL142
jump LABEL278
LABEL142:
viewport_geteffectivesize
istore 11
istore 10
@@ -168,14 +199,14 @@ LABEL116:
if_setsize
iload 4
iconst -1
if_icmpne LABEL159
jump LABEL242
LABEL159:
if_icmpne LABEL185
jump LABEL268
LABEL185:
iload 5
iconst -1
if_icmpne LABEL163
jump LABEL242
LABEL163:
if_icmpne LABEL189
jump LABEL268
LABEL189:
iload 12
iload 14
sub
@@ -254,8 +285,8 @@ LABEL163:
iload 8
iload 9
invoke 910
jump LABEL252
LABEL242:
jump LABEL278
LABEL268:
iload 1
iconst 73
iconst 73
@@ -266,9 +297,9 @@ LABEL242:
iconst 0
iconst 0
invoke 910
LABEL252:
jump LABEL369
LABEL253:
LABEL278:
jump LABEL395
LABEL279:
iconst 0
iconst 0
iconst 0
@@ -278,52 +309,52 @@ LABEL253:
iconst 128
sconst "outerZoomLimit"
runelite_callback
if_icmpge LABEL262
jump LABEL278
LABEL262:
if_icmpge LABEL288
jump LABEL304
LABEL288:
get_varc_int 73
iconst 896
sconst "innerZoomLimit"
runelite_callback
if_icmple LABEL266
jump LABEL278
LABEL266:
if_icmple LABEL292
jump LABEL304
LABEL292:
get_varc_int 74
iconst 128
sconst "outerZoomLimit"
runelite_callback
if_icmpge LABEL270
jump LABEL278
LABEL270:
if_icmpge LABEL296
jump LABEL304
LABEL296:
get_varc_int 74
iconst 896
sconst "innerZoomLimit"
runelite_callback
if_icmple LABEL274
jump LABEL278
LABEL274:
if_icmple LABEL300
jump LABEL304
LABEL300:
get_varc_int 73
get_varc_int 74
invoke 42
jump LABEL281
LABEL278:
jump LABEL307
LABEL304:
iconst 512
iconst 512
invoke 42
LABEL281:
LABEL307:
viewport_geteffectivesize
istore 11
istore 10
iload 2
iconst -1
if_icmpne LABEL288
jump LABEL369
LABEL288:
if_icmpne LABEL314
jump LABEL395
LABEL314:
iload 3
iconst -1
if_icmpne LABEL292
jump LABEL369
LABEL292:
if_icmpne LABEL318
jump LABEL395
LABEL318:
iload 10
iload 11
iconst 0
@@ -342,14 +373,14 @@ LABEL292:
if_setsize
iload 4
iconst -1
if_icmpne LABEL312
jump LABEL359
LABEL312:
if_icmpne LABEL338
jump LABEL385
LABEL338:
iload 5
iconst -1
if_icmpne LABEL316
jump LABEL359
LABEL316:
if_icmpne LABEL342
jump LABEL385
LABEL342:
iload 6
iload 7
iconst 0
@@ -392,8 +423,8 @@ LABEL316:
iload 8
iload 9
invoke 910
jump LABEL369
LABEL359:
jump LABEL395
LABEL385:
iload 1
iconst 73
iconst 73
@@ -404,7 +435,7 @@ LABEL359:
iconst 0
iconst 0
invoke 910
LABEL369:
LABEL395:
iconst 73
iconst 73
iload 1
@@ -413,62 +444,62 @@ LABEL369:
istore 18
iload 18
iconst -1
if_icmpne LABEL379
jump LABEL423
LABEL379:
if_icmpne LABEL405
jump LABEL449
LABEL405:
invoke 1972
iconst 0
if_icmpeq LABEL383
jump LABEL417
LABEL383:
if_icmpeq LABEL409
jump LABEL443
LABEL409:
iload 18
if_hassub
iconst 1
if_icmpeq LABEL388
jump LABEL417
LABEL388:
if_icmpeq LABEL414
jump LABEL443
LABEL414:
get_varc_int 173
iconst -2
if_icmpeq LABEL392
jump LABEL399
LABEL392:
if_icmpeq LABEL418
jump LABEL425
LABEL418:
iconst 512
iconst 0
iconst 0
iconst 1
iload 18
if_setsize
jump LABEL416
LABEL399:
jump LABEL442
LABEL425:
get_varc_int 173
iconst -3
if_icmpeq LABEL403
jump LABEL410
LABEL403:
if_icmpeq LABEL429
jump LABEL436
LABEL429:
iconst 0
iconst 0
iconst 1
iconst 1
iload 18
if_setsize
jump LABEL416
LABEL410:
jump LABEL442
LABEL436:
iconst 512
iconst 334
iconst 0
iconst 0
iload 18
if_setsize
LABEL416:
jump LABEL423
LABEL417:
LABEL442:
jump LABEL449
LABEL443:
iconst 512
iconst 334
iconst 0
iconst 0
iload 18
if_setsize
LABEL423:
LABEL449:
iconst 73
iconst 73
iload 1
@@ -481,9 +512,9 @@ LABEL423:
istore 20
iload 18
iconst -1
if_icmpne LABEL437
jump LABEL481
LABEL437:
if_icmpne LABEL463
jump LABEL511
LABEL463:
iconst 73
iconst 73
iload 1
@@ -491,54 +522,59 @@ LABEL437:
enum
if_hassub
iconst 1
if_icmpeq LABEL446
jump LABEL455
LABEL446:
if_icmpeq LABEL472
jump LABEL481
LABEL472:
get_varbit 4692
iconst 0
if_icmpne LABEL450
jump LABEL453
LABEL450:
if_icmpne LABEL476
jump LABEL479
LABEL476:
iconst 0
istore 20
jump LABEL455
LABEL453:
jump LABEL481
LABEL479:
iconst 38
istore 20
LABEL455:
LABEL481:
invoke 1972
iconst 1
if_icmpeq LABEL459
jump LABEL473
LABEL459:
if_icmpeq LABEL485
jump LABEL503
LABEL485:
get_varbit 542
iconst 0
if_icmpeq LABEL489
jump LABEL503
LABEL489:
get_varbit 6254
iconst 0
if_icmpeq LABEL463
jump LABEL468
LABEL463:
if_icmpeq LABEL493
jump LABEL498
LABEL493:
iconst 182
iconst 4
add
istore 19
jump LABEL472
LABEL468:
jump LABEL502
LABEL498:
iconst 120
iconst 4
add
istore 19
LABEL472:
jump LABEL475
LABEL473:
LABEL502:
jump LABEL505
LABEL503:
iconst 0
istore 19
LABEL475:
LABEL505:
iload 19
iload 20
iconst 2
iconst 0
iload 18
if_setposition
LABEL481:
LABEL511:
iconst 73
iconst 73
iload 1
@@ -549,38 +585,38 @@ LABEL481:
istore 19
iload 18
iconst -1
if_icmpne LABEL493
jump LABEL515
LABEL493:
if_icmpne LABEL523
jump LABEL545
LABEL523:
invoke 1972
iconst 1
if_icmpeq LABEL497
jump LABEL507
LABEL497:
if_icmpeq LABEL527
jump LABEL537
LABEL527:
get_varbit 6254
iconst 0
if_icmpeq LABEL501
jump LABEL504
LABEL501:
if_icmpeq LABEL531
jump LABEL534
LABEL531:
iconst 182
istore 19
jump LABEL506
LABEL504:
jump LABEL536
LABEL534:
iconst 120
istore 19
LABEL506:
jump LABEL509
LABEL507:
LABEL536:
jump LABEL539
LABEL537:
iconst 0
istore 19
LABEL509:
LABEL539:
iload 19
iconst 0
iconst 1
iconst 1
iload 18
if_setsize
LABEL515:
LABEL545:
iload 0
iload 1
invoke 920

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

@@ -1 +1 @@
0CEA896F74B3F885C26633865A18FDAE02AD6C78C114646FCA710018F6271C55
8567736DBA2A2558DBD5883204C10FF794768C18DB4D85FE44C0959EB7F40885

160
runelite-client/src/main/scripts/ToplevelChatboxBackground.rs2asm
View File

@@ -13,42 +13,50 @@
istore 0
get_varc_int 41
iconst 1337
if_icmpeq LABEL8
jump LABEL24
LABEL8:
invoke 922
if_icmpeq LABEL15
get_varbit 542
iconst 1
if_icmpeq LABEL12
jump LABEL15
LABEL12:
iconst 1
istore 0
jump LABEL24
LABEL15:
if_icmpeq LABEL11
jump LABEL31
LABEL11:
getwindowmode
iconst 1
if_icmpne LABEL15
jump LABEL31
LABEL15:
invoke 922
iconst 1
if_icmpeq LABEL19
jump LABEL24
jump LABEL22
LABEL19:
iconst 1
istore 0
jump LABEL31
LABEL22:
getwindowmode
iconst 1
if_icmpeq LABEL26
jump LABEL31
LABEL26:
iconst 0
set_varc_int 41
iconst 0
iconst 0
invoke 183
LABEL24:
LABEL31:
iload 0
iconst 10616869
if_sethide
get_varbit 6374
iconst 1
if_icmpeq LABEL31
jump LABEL48
LABEL31:
if_icmpeq LABEL38
jump LABEL55
LABEL38:
getwindowmode
iconst 1
if_icmpne LABEL35
jump LABEL48
LABEL35:
if_icmpne LABEL42
jump LABEL55
LABEL42:
iconst 1
iconst 0
iconst 2
@@ -61,8 +69,8 @@ LABEL35:
iconst 0
iconst 10617392
if_setposition
jump LABEL60
LABEL48:
jump LABEL67
LABEL55:
iconst 0
iconst 0
iconst 0
@@ -75,7 +83,7 @@ LABEL48:
iconst 0
iconst 10617392
if_setposition
LABEL60:
LABEL67:
iconst 10616870
cc_deleteall
iconst 10616889
@@ -84,14 +92,14 @@ LABEL60:
istore 1
clientclock
get_varc_int 223
if_icmplt LABEL70
jump LABEL82
LABEL70:
if_icmplt LABEL77
jump LABEL89
LABEL77:
invoke 900
iconst 1129
if_icmpne LABEL74
jump LABEL82
LABEL74:
if_icmpne LABEL81
jump LABEL89
LABEL81:
iconst 1
istore 1
iconst 2155
@@ -99,26 +107,26 @@ LABEL74:
sconst "i"
iconst 10616870
if_setontimer
jump LABEL86
LABEL82:
jump LABEL93
LABEL89:
iconst -1
sconst ""
iconst 10616870
if_setontimer
LABEL86:
LABEL93:
invoke 921
iconst 0
if_icmpeq LABEL90
jump LABEL156
LABEL90:
if_icmpeq LABEL97
jump LABEL163
LABEL97:
iconst 1
iconst 10616870
if_setnoclickthrough
iload 1
iconst 0
if_icmpeq LABEL97
jump LABEL135
LABEL97:
if_icmpeq LABEL104
jump LABEL142
LABEL104:
iconst 10616870
iconst 5
iconst 0
@@ -157,7 +165,7 @@ LABEL97:
cc_setcolour
iconst 1
cc_setfill
LABEL135:
LABEL142:
iconst 10617392
iconst 792
iconst 789
@@ -169,20 +177,20 @@ LABEL135:
invoke 838
invoke 2373
iconst 1
if_icmpeq LABEL148
jump LABEL152
LABEL148:
if_icmpeq LABEL155
jump LABEL159
LABEL155:
iconst 255
iconst 10616835
if_settrans
jump LABEL155
LABEL152:
jump LABEL162
LABEL159:
iconst 0
iconst 10616835
if_settrans
LABEL155:
LABEL162:
return
LABEL156:
LABEL163:
iconst 16384
iconst 25
div
@@ -191,38 +199,38 @@ LABEL156:
istore 3
get_varbit 2570
iconst 1
if_icmpeq LABEL166
jump LABEL170
LABEL166:
if_icmpeq LABEL173
jump LABEL177
LABEL173:
iconst 1
iconst 10616870
if_setnoclickthrough
jump LABEL176
LABEL170:
jump LABEL183
LABEL177:
iconst 0
iconst 10616870
if_setnoclickthrough
iconst 1
iconst 10616870
2006
LABEL176:
LABEL183:
iconst 0
istore 4
iload 1
iconst 0
if_icmpeq LABEL182
jump LABEL332
LABEL182:
if_icmpeq LABEL189
jump LABEL339
LABEL189:
invoke 1972
iconst 0
if_icmpeq LABEL186
jump LABEL266
LABEL186:
if_icmpeq LABEL193
jump LABEL273
LABEL193:
iload 4
iconst 20
if_icmplt LABEL190
jump LABEL265
LABEL190:
if_icmplt LABEL197
jump LABEL272
LABEL197:
iconst 10616870
iconst 3
iload 4
@@ -297,12 +305,12 @@ LABEL190:
sub
istore 3
istore 4
jump LABEL186
LABEL265:
jump LABEL193
LABEL272:
sconst "chatboxBackgroundBuilt"
runelite_callback
jump LABEL332
LABEL266:
jump LABEL339
LABEL273:
iconst 10616870
iconst 3
iload 4
@@ -369,7 +377,7 @@ LABEL266:
cc_settrans
iconst 130
cc_settrans 1
LABEL332:
LABEL339:
iconst 10617392
iconst 1190
iconst 1187
@@ -381,24 +389,24 @@ LABEL332:
invoke 838
iload 0
iconst 1
if_icmpeq LABEL345
jump LABEL349
LABEL345:
if_icmpeq LABEL352
jump LABEL356
LABEL352:
iconst 255
iconst 10616835
if_settrans
jump LABEL380
LABEL349:
jump LABEL387
LABEL356:
invoke 1972
iconst 0
if_icmpeq LABEL353
jump LABEL357
LABEL353:
if_icmpeq LABEL360
jump LABEL364
LABEL360:
iconst 155
iconst 10616835
if_settrans
jump LABEL380
LABEL357:
jump LABEL387
LABEL364:
iconst 255
iconst 10616835
if_settrans
@@ -422,5 +430,5 @@ LABEL357:
cc_setfill
iconst 225
cc_settrans
LABEL380:
LABEL387:
return