Skip to content

Commit ab6e0de

Browse files
committed
191.3
1 parent 277356a commit ab6e0de

File tree

6 files changed

+216
-215
lines changed

6 files changed

+216
-215
lines changed

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,7 @@
419419
[**416**](scripts/[clientscript,smithing_setup].cs2) `[clientscript,smithing_setup]`
420420
[**417**](scripts/script417.cs2)
421421
[**418**](scripts/script418.cs2)
422+
[**419**](scripts/script419.cs2)
422423
[**420**](scripts/[clientscript,combat_interface_setup].cs2) `[clientscript,combat_interface_setup]`
423424
[**421**](scripts/[clientscript,slayer_rewards_tasks_currenttask].cs2) `[clientscript,slayer_rewards_tasks_currenttask]`
424425
[**422**](scripts/[proc,slayer_rewards_tasks_currenttask].cs2) `[proc,slayer_rewards_tasks_currenttask]`
@@ -2742,6 +2743,7 @@
27422743
[**2740**](scripts/script2740.cs2)
27432744
[**2741**](scripts/script2741.cs2)
27442745
[**2742**](scripts/script2742.cs2)
2746+
[**2743**](scripts/script2743.cs2)
27452747
[**2744**](scripts/script2744.cs2)
27462748
[**2745**](scripts/[clientscript,farming_tools_main_create_quantitybutton].cs2) `[clientscript,farming_tools_main_create_quantitybutton]`
27472749
[**2746**](scripts/script2746.cs2)

scripts/[proc,bankside_extraop].cs2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ switch_obj ($obj0) {
2121
if (testbit(%var261, 3) = ^true) {
2222
$string0 = "Empty";
2323
}
24+
case coal_bag_12019, open_coal_bag_24480 :
25+
if (testbit(%var261, 4) = ^true) {
26+
$string0 = "Fill";
27+
}
2428
case default :
2529
if (string_length($string0) <= 0 & (map_members = ^true | oc_members($obj0) = ^false)) {
2630
if (testbit(%var262, $int1) = ^true) {

scripts/[proc,skill_guide_data].cs2

Lines changed: 23 additions & 205 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,44 +1191,46 @@ switch_int ($int0) {
11911191
case 66 :
11921192
return(71, agility_climb_6517, "Slayer Tower advanced spiked chain climb");
11931193
case 67 :
1194-
return(72, agility_contortion_6516, "Stronghold Slayer Cave narrow tunnel");
1194+
return(71, agility_climb_6517, "Gu'Tanoth wall climb<br> (after completing the Watchtower quest)");
11951195
case 68 :
1196-
return(73, agility_climb_6517, "Troll Stronghold wall-climb");
1196+
return(72, agility_contortion_6516, "Stronghold Slayer Cave narrow tunnel");
11971197
case 69 :
1198-
return(73, agility_climb_6517, "Arceuus essence mine western descent");
1198+
return(73, agility_climb_6517, "Troll Stronghold wall-climb");
11991199
case 70 :
1200-
return(74, agility_jump_6514, "Lava Dragon Isle jump");
1200+
return(73, agility_climb_6517, "Arceuus essence mine western descent");
12011201
case 71 :
1202-
return(75, agility_jump_6514, "Forthos Dungeon spiked blades jump");
1202+
return(74, agility_jump_6514, "Lava Dragon Isle jump");
12031203
case 72 :
1204-
return(75, agility_jump_6514, "Revenant cave jump (medium)");
1204+
return(75, agility_jump_6514, "Forthos Dungeon spiked blades jump");
12051205
case 73 :
1206-
return(76, agility_jump_6514, "Island crossing near Zul-Andra");
1206+
return(75, agility_jump_6514, "Revenant cave jump (medium)");
12071207
case 74 :
1208-
return(77, agility_jump_6514, "Shilo Village river crossing");
1208+
return(76, agility_jump_6514, "Island crossing near Zul-Andra");
12091209
case 75 :
1210-
return(78, agility_contortion_6516, "Iorwerth Dungeon northern shortcut");
1210+
return(77, agility_jump_6514, "Shilo Village river crossing");
12111211
case 76 :
1212-
return(79, agility_climb_6517, "Kharazi Jungle vine climb<br> (with Legends' Guild access)");
1212+
return(78, agility_contortion_6516, "Iorwerth Dungeon northern shortcut");
12131213
case 77 :
1214-
return(80, agility_jump_6514, "Taverley Dungeon spiked blades jump");
1214+
return(79, agility_climb_6517, "Kharazi Jungle vine climb<br> (with Legends' Guild access)");
12151215
case 78 :
1216-
return(81, agility_jump_6514, "Fremennik Slayer Dungeon spiked blades jump");
1216+
return(80, agility_jump_6514, "Taverley Dungeon spiked blades jump");
12171217
case 79 :
1218-
return(82, agility_jump_6514, "Lava Maze northern jump");
1218+
return(81, agility_jump_6514, "Fremennik Slayer Dungeon spiked blades jump");
12191219
case 80 :
1220-
return(83, agility_jump_6514, "Brimhaven Dungeon eastern stepping stones");
1220+
return(82, agility_jump_6514, "Lava Maze northern jump");
12211221
case 81 :
1222-
return(84, agility_contortion_6516, "Iorwerth Dungeon southern shortcut");
1222+
return(83, agility_jump_6514, "Brimhaven Dungeon eastern stepping stones");
12231223
case 82 :
1224-
return(85, agility_climb_6517, "Elven overpass advanced cliffside scramble");
1224+
return(84, agility_contortion_6516, "Iorwerth Dungeon southern shortcut");
12251225
case 83 :
1226-
return(86, agility_contortion_6516, "Kalphite Lair shortcut");
1226+
return(85, agility_climb_6517, "Elven overpass advanced cliffside scramble");
12271227
case 84 :
1228-
return(87, agility_climb_6517, "Brimhaven Dungeon vine to baby green dragons");
1228+
return(86, agility_contortion_6516, "Kalphite Lair shortcut");
12291229
case 85 :
1230-
return(88, agility_contortion_6516, "Karuulm Dungeon pipe");
1230+
return(87, agility_climb_6517, "Brimhaven Dungeon vine to baby green dragons");
12311231
case 86 :
1232+
return(88, agility_contortion_6516, "Karuulm Dungeon pipe");
1233+
case 87 :
12321234
return(89, agility_jump_6514, "Revenant cave jump (hard)");
12331235
case default :
12341236
return(-1, null, "");
@@ -1754,7 +1756,7 @@ switch_int ($int0) {
17541756
return(49, lantern_lens_4542, "Bullseye lantern lens");
17551757
}
17561758
if ($int2 = 8) {
1757-
return(87, light_orb_10973, "Dorgeshuun light orb");
1759+
return(87, light_orb_10973, "Dorgeshuun Memberslight orb");
17581760
}
17591761
return(-1, null, "");
17601762
case 5 :
@@ -4247,191 +4249,7 @@ switch_int ($int0) {
42474249
}
42484250
return(-1, null, "");
42494251
case 20 :
4250-
if ($int1 = 0) {
4251-
switch_int ($int2) {
4252-
case 0 :
4253-
return(5, crawling_hand_4133, "Crawling hands");
4254-
case 1 :
4255-
return(7, swamp_cave_bug_4521, "Cave bugs");
4256-
case 2 :
4257-
return(10, cave_crawler_4134, "Cave crawlers");
4258-
case 3 :
4259-
return(15, banshee_4135, "Banshees");
4260-
case 4 :
4261-
return(17, swamp_cave_slime_4520, "Cave slime");
4262-
case 5 :
4263-
return(20, rockslug_4136, "Rockslugs");
4264-
case 6 :
4265-
return(22, desert_lizard_6695, "Desert lizards");
4266-
case 7 :
4267-
return(25, cockatrice_4137, "Cockatrice");
4268-
case 8 :
4269-
return(30, pyrefiend_4138, "Pyrefiends");
4270-
case 9 :
4271-
return(32, mogre_6661, "Mogres");
4272-
case 10 :
4273-
return(33, swarm_7050, "Harpie bug swarms");
4274-
case 11 :
4275-
return(35, swamp_wallbeast_4519, "Wall beasts");
4276-
case 12 :
4277-
return(37, killerwatt_7160, "Killerwatts");
4278-
case 13 :
4279-
return(38, vyre_24702, "Vyres");
4280-
case 14 :
4281-
return(39, molanisk_10997, "Molanisks");
4282-
case 15 :
4283-
return(40, basilisk_4139, "Basilisks");
4284-
case 16 :
4285-
return(40, sea_snake_5089, "Sea snakes");
4286-
case 17 :
4287-
return(40, terror_dog_10591, "Terror dogs");
4288-
case 18 :
4289-
return(42, fever_spider_6709, "Fever spiders");
4290-
case 19 :
4291-
return(44, sulphur_lizard_23043, "Sulphur Lizards");
4292-
case 20 :
4293-
return(45, infernal_mage_4140, "Infernal mages");
4294-
case 21 :
4295-
return(47, brine_rat_11047, "Brine rats");
4296-
case 22 :
4297-
return(50, bloodveld_4141, "Bloodvelds");
4298-
case 23 :
4299-
return(52, jelly_4142, "Jellies");
4300-
case 24 :
4301-
return(55, turoth_4143, "Turoth");
4302-
case 25 :
4303-
return(57, mutated_zygomite_7420, "Mutated zygomites");
4304-
case 26 :
4305-
return(58, cave_horror_8900, "Cave horrors");
4306-
case 27 :
4307-
return(60, aberrant_spectre_4144, "Aberrant spectres");
4308-
case 28 :
4309-
return(60, basilisk_knight_24276, "Basilisk knights");
4310-
case 29 :
4311-
return(62, wyrm_23040, "Wyrms");
4312-
case 30 :
4313-
return(63, obj_11845, "Spiritual rangers");
4314-
case 31 :
4315-
return(65, dust_devil_4145, "Dust devils");
4316-
case 32 :
4317-
return(66, fossil_island_wyvern_21507, "Fossil Island wyverns");
4318-
case 33 :
4319-
return(68, obj_11846, "Spiritual warriors");
4320-
case 34 :
4321-
return(70, kurask_4146, "Kurask");
4322-
case 35 :
4323-
return(72, skeletal_wyvern_6811, "Skeletal wyverns");
4324-
case 36 :
4325-
return(75, gargoyle_4147, "Gargoyles");
4326-
case 37 :
4327-
return(77, brutal_black_dragon_21391, "Brutal black dragons");
4328-
case 38 :
4329-
return(80, nechryael_4148, "Nechryael");
4330-
case 39 :
4331-
return(82, fossil_island_wyvern_21508, "Ancient wyverns");
4332-
case 40 :
4333-
return(83, obj_11844, "Spiritual mages");
4334-
case 41 :
4335-
return(84, drake_23041, "Drakes");
4336-
case 42 :
4337-
return(85, abyssal_demon_4149, "Abyssal demons & sires");
4338-
case 43 :
4339-
return(87, cave_kraken_3272, "Cave kraken");
4340-
case 44 :
4341-
return(90, dark_beast_6637, "Dark beasts");
4342-
case 45 :
4343-
return(91, hellpuppy_13247, "Cerberus");
4344-
case 46 :
4345-
return(93, smoke_devil_5349, "Smoke devil");
4346-
case 47 :
4347-
return(95, hydra_23042, "Hydras");
4348-
case default :
4349-
return(-1, null, "");
4350-
}
4351-
}
4352-
if ($int1 = 1) {
4353-
switch_int ($int2) {
4354-
case 0 :
4355-
return(1, spiny_helmet_4551, "Spiny helmet<br> (with 5 Defence)");
4356-
case 1 :
4357-
return(1, rock_hammer_4162, "Rock hammer & Rock Thrownhammer");
4358-
case 2 :
4359-
return(1, reinforced_goggles_24942, "Reinforced Goggles");
4360-
case 3 :
4361-
return(10, facemask_4164, "Facemask");
4362-
case 4 :
4363-
return(15, earmuffs_4166, "Earmuffs");
4364-
case 5 :
4365-
return(25, mirror_shield_4156, "Mirror shield<br> (with 20 Defence)");
4366-
case 6 :
4367-
return(32, fishing_explosive_6660, "Fishing explosive");
4368-
case 7 :
4369-
return(33, lit_bug_lantern_7053, "Harpie bug lantern<br> (not a light source)");
4370-
case 8 :
4371-
return(35, witchwood_icon_8923, "Witchwood icon");
4372-
case 9 :
4373-
return(37, insulated_boots_7159, "Insulated boots");
4374-
case 10 :
4375-
return(39, slayer_bell_10952, "Slayer bell");
4376-
case 11 :
4377-
return(42, slayer_gloves_6720, "Slayer gloves");
4378-
case 12 :
4379-
return(44, boots_of_stone_23037, "Boots of Stone");
4380-
case 13 :
4381-
return(55, leaf_bladed_spear_4158, "Leaf-bladed spear and sword<br> (with 50 Attack)");
4382-
case 14 :
4383-
return(55, leaf_bladed_battleaxe_20727, "Leaf-bladed battleaxe<br> (with 65 Attack)");
4384-
case 15 :
4385-
return(55, broad_arrows_4150, "Broad arrows<br> (with 50 Ranged)");
4386-
case 16 :
4387-
return(55, broad_bolts_5_4296, "Broad bolts<br> (with 61 Ranged)");
4388-
case 17 :
4389-
return(55, slayers_staff_4170, "Slayer's staff<br> (with 50 Magic)");
4390-
case 18 :
4391-
return(55, slayers_staff_e_21255, "Slayer's staff (e)<br> (with 75 Magic)");
4392-
case 19 :
4393-
return(57, fungicide_spray_10_7421, "Fungicide spray");
4394-
case 20 :
4395-
return(60, nose_peg_4168, "Nose peg");
4396-
case 21 :
4397-
return(60, vs_shield_24266, "V's shield<br> (with 40 Defence)");
4398-
case 22 :
4399-
return(65, amethyst_broad_bolts_5_3902, "Amethyst broad bolts<br> (with 61 Ranged)");
4400-
case default :
4401-
return(-1, null, "");
4402-
}
4403-
}
4404-
if ($int1 = 2) {
4405-
if ($int2 = 0) {
4406-
return(1, enchanted_gem_4155, "Wilderness master<br> (no requirements)");
4407-
}
4408-
if ($int2 = 1) {
4409-
return(1, enchanted_gem_4155, "Draynor Village master<br> (after A Porcine of Interest)");
4410-
}
4411-
if ($int2 = 2) {
4412-
return(1, enchanted_gem_4155, "Burthorpe master<br> (with level 3 combat)");
4413-
}
4414-
if ($int2 = 3) {
4415-
return(1, enchanted_gem_4155, "Canifis master<br> (with level 20 combat)");
4416-
}
4417-
if ($int2 = 4) {
4418-
return(1, enchanted_gem_4155, "Edgeville Dungeon master<br> (with level 40 combat)");
4419-
}
4420-
if ($int2 = 5) {
4421-
return(1, enchanted_gem_4155, "Zanaris master<br> (with level 70 combat)");
4422-
}
4423-
if ($int2 = 6) {
4424-
return(1, enchanted_gem_4155, "Mount Karuulm master<br> (with level 75 combat)");
4425-
}
4426-
if ($int2 = 7) {
4427-
return(1, enchanted_gem_4155, "Gnome Stronghold master<br> (with level 85 combat)");
4428-
}
4429-
if ($int2 = 8) {
4430-
return(50, enchanted_gem_4155, "Shilo Village master<br> (with level 100 combat)");
4431-
}
4432-
return(-1, null, "");
4433-
}
4434-
return(-1, null, "");
4252+
return(~script2743($int1, $int2));
44354253
case 21 :
44364254
if ($int1 = 0) {
44374255
if ($int2 = 0) {

scripts/[proc,skill_guide_subsection].cs2

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,16 +304,7 @@ switch_int ($int0) {
304304
}
305305
return("", -1);
306306
case 20 :
307-
if ($int1 = 0) {
308-
return("Monsters", 1);
309-
}
310-
if ($int1 = 1) {
311-
return("Equipment", 1);
312-
}
313-
if ($int1 = 2) {
314-
return("Slayer Masters", 1);
315-
}
316-
return("", -1);
307+
return(~script419($int1));
317308
case 21 :
318309
if ($int1 = 0) {
319310
return("Allotments", 1);

0 commit comments

Comments
 (0)