Skip to content

Commit b50f87f

Browse files
hunterwbhunterwb
committed
197.4
1 parent b0eb330 commit b50f87f

10 files changed

+142
-62
lines changed

Diff for: ‎scripts/[clientscript,settings_icon_op].cs2

+9
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,19 @@ if ($int7 > 0) {
1515
} else {
1616
switch_int ($int0) {
1717
case 30 :
18+
if (%varbit12426 <= 0) {
19+
%varbit12426 = 25;
20+
}
1821
~settings_set_slider($int0, calc(%varbit12426 / 5));
1922
case 31 :
23+
if (%varbit12427 <= 0) {
24+
%varbit12427 = 50;
25+
}
2026
~settings_set_slider($int0, calc(%varbit12427 / 5));
2127
case 32 :
28+
if (%varbit12428 <= 0) {
29+
%varbit12428 = 50;
30+
}
2231
~settings_set_slider($int0, calc(%varbit12428 / 5));
2332
}
2433
}

Diff for: ‎scripts/[clientscript,slayer_rewards_tasks_canceltask].cs2

+11-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// 423
2-
[clientscript,slayer_rewards_tasks_canceltask](string $string0, boolean $boolean0, component $component1, component $component2, component $component3, component $component4, component $component5)
2+
[clientscript,slayer_rewards_tasks_canceltask](string $string0, int $int0, component $component1, component $component2, component $component3, component $component4, component $component5)
33
sound_synth(interface_select1, 1, 0);
44
if_sethide(true, $component1);
55
if_sethide(false, $component2);
@@ -8,12 +8,18 @@ if_setposition(33, 165, ^setpos_abs_left, ^setpos_abs_top, $component5);
88
if_sethide(false, $component4);
99
def_string $text1 = "";
1010
def_int $comsubid6 = 0;
11-
if ($boolean0 = true) {
12-
$comsubid6 = calc(50 + 2);
11+
if ($int0 = 2) {
12+
$comsubid6 = calc(51 + 2);
1313
$text1 = "<u=ff981f><$string0></u><br><br>Your current task will be cancelled, and the Slayer Masters will be blocked from assigning this category to you again.<br><br><col=ff0000>Cost: <tostring(100)> points</col><br><br>If you unblock this creature in future, you will not get your points back.";
14-
} else {
15-
$comsubid6 = calc(50 + 1);
14+
} else if ($int0 = 1) {
15+
$comsubid6 = calc(51 + 1);
1616
$text1 = "<u=ff981f><$string0></u><br><br>Your current task will be cancelled. The Slayer Masters may assign this category to you again in future.<br><br><col=ff0000>Cost: <tostring(30)> points</col>";
17+
} else if ($int0 = 10) {
18+
$comsubid6 = calc(51 + 10);
19+
$text1 = "<u=ff981f><$string0></u><br><br>Your current task will be stored. You may unstore it if you do not have an active task. The Slayer Masters may assign this category to you again in future.<br><br><col=ff0000>Cost: <tostring(50)> points</col>";
20+
} else if ($int0 = 11) {
21+
$comsubid6 = calc(51 + 11);
22+
$text1 = "<u=ff981f><$string0></u><br><br>Your stored task will become your active task. <br><br><col=ff0000>Cost: <tostring(0)> points</col>";
1723
}
1824
if_settext($text1, $component3);
1925
def_int $comsubid7 = 0;

Diff for: ‎scripts/[clientscript,slayer_rewards_tasks_currenttask].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 421
2-
[clientscript,slayer_rewards_tasks_currenttask](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6)
3-
~slayer_rewards_tasks_currenttask($component0, $component1, $component2, $component3, $component4, $component5, $component6);
2+
[clientscript,slayer_rewards_tasks_currenttask](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
3+
~slayer_rewards_tasks_currenttask($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8);

Diff for: ‎scripts/[clientscript,slayer_rewards_tasks_init].cs2

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// 328
2-
[clientscript,slayer_rewards_tasks_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7)
3-
if_settext("You may spend points to <col=ffffff>Cancel</col> or <col=ffffff>Block</col> your current task.<br>If you <col=ffffff>cancel</col> it, you may be assigned that target again in future. <col=ff0000>(<tostring(30)> points)</col><br>If you <col=ffffff>block</col> it, you will not get that assignment again. <col=ff0000>(<tostring(100)> points)</col><br><col=ffffff>Neither</col> option will reset your current tally of completed Slayer tasks.", $component1);
4-
~slayer_rewards_tasks_currenttask($component0, $component2, $component3, $component4, $component5, $component6, $component7);
5-
if_setonvartransmit("slayer_rewards_tasks_currenttask($component0, $component2, $component3, $component4, $component5, $component6, $component7){var261, var262}", $component0);
2+
[clientscript,slayer_rewards_tasks_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
3+
~slayer_rewards_tasks_currenttask($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8);
4+
if_setonvartransmit("slayer_rewards_tasks_currenttask($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8){var261, var262, var264, var265, var661, var1344}", $component0);

Diff for: ‎scripts/[clientscript,slayer_rewards_unlock_confirm].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if_sethide(false, $component5);
99
def_string $string1 = "Extend everything";
1010
def_string $op2 = "Confirm";
1111
def_string $text3 = "";
12-
if ($int1 = calc(50 + 9)) {
12+
if ($int1 = calc(51 + 9)) {
1313
$text3 = "<u=ff981f><$string1></u><br><br>All task extensions will be unlocked. You can re-lock them individually later, but will not receive a refund.<br><br><col=ff0000>Pay <tostring($int7)> points?</col>";
1414
} else if ($int1 = 35 & $boolean0 = false) {
1515
$string1 = enum(int, string, enum_834, $int1);

Diff for: ‎scripts/[proc,skill_guide_data].cs2

+21-19
Original file line numberDiff line numberDiff line change
@@ -998,44 +998,46 @@ switch_int ($int0) {
998998
case 68 :
999999
return(72, agility_contortion_6516, "Stronghold Slayer Cave narrow tunnel");
10001000
case 69 :
1001-
return(73, agility_climb_6517, "Troll Stronghold wall-climb");
1001+
return(72, agility_contortion_6516, "Asgarnian Ice Dungeon wyvern tunnel");
10021002
case 70 :
1003-
return(73, agility_climb_6517, "Arceuus essence mine western descent");
1003+
return(73, agility_climb_6517, "Troll Stronghold wall-climb");
10041004
case 71 :
1005-
return(74, agility_jump_6514, "Lava Dragon Isle jump");
1005+
return(73, agility_climb_6517, "Arceuus essence mine western descent");
10061006
case 72 :
1007-
return(75, agility_jump_6514, "Forthos Dungeon spiked blades jump");
1007+
return(74, agility_jump_6514, "Lava Dragon Isle jump");
10081008
case 73 :
1009-
return(75, agility_jump_6514, "Revenant cave jump (medium)");
1009+
return(75, agility_jump_6514, "Forthos Dungeon spiked blades jump");
10101010
case 74 :
1011-
return(76, agility_jump_6514, "Island crossing near Zul-Andra");
1011+
return(75, agility_jump_6514, "Revenant cave jump (medium)");
10121012
case 75 :
1013-
return(77, agility_jump_6514, "Shilo Village river crossing");
1013+
return(76, agility_jump_6514, "Island crossing near Zul-Andra");
10141014
case 76 :
1015-
return(78, agility_contortion_6516, "Iorwerth Dungeon northern shortcut");
1015+
return(77, agility_jump_6514, "Shilo Village river crossing");
10161016
case 77 :
1017-
return(79, agility_climb_6517, "Kharazi Jungle vine climb<br> (with Legends' Guild access)");
1017+
return(78, agility_contortion_6516, "Iorwerth Dungeon northern shortcut");
10181018
case 78 :
1019-
return(80, agility_jump_6514, "Taverley Dungeon spiked blades jump");
1019+
return(79, agility_climb_6517, "Kharazi Jungle vine climb<br> (with Legends' Guild access)");
10201020
case 79 :
1021-
return(81, agility_jump_6514, "Fremennik Slayer Dungeon spiked blades jump");
1021+
return(80, agility_jump_6514, "Taverley Dungeon spiked blades jump");
10221022
case 80 :
1023-
return(82, agility_jump_6514, "Lava Maze northern jump");
1023+
return(81, agility_jump_6514, "Fremennik Slayer Dungeon spiked blades jump");
10241024
case 81 :
1025-
return(83, agility_jump_6514, "Brimhaven Dungeon eastern stepping stones");
1025+
return(82, agility_jump_6514, "Lava Maze northern jump");
10261026
case 82 :
1027-
return(84, agility_contortion_6516, "Iorwerth Dungeon southern shortcut");
1027+
return(83, agility_jump_6514, "Brimhaven Dungeon eastern stepping stones");
10281028
case 83 :
1029-
return(85, agility_climb_6517, "Elven overpass advanced cliffside scramble");
1029+
return(84, agility_contortion_6516, "Iorwerth Dungeon southern shortcut");
10301030
case 84 :
1031-
return(86, agility_contortion_6516, "Kalphite Lair shortcut");
1031+
return(85, agility_climb_6517, "Elven overpass advanced cliffside scramble");
10321032
case 85 :
1033-
return(87, agility_climb_6517, "Brimhaven Dungeon vine to baby green dragons");
1033+
return(86, agility_contortion_6516, "Kalphite Lair shortcut");
10341034
case 86 :
1035-
return(88, agility_contortion_6516, "Karuulm Dungeon pipe");
1035+
return(87, agility_climb_6517, "Brimhaven Dungeon vine to baby green dragons");
10361036
case 87 :
1037-
return(89, agility_jump_6514, "Revenant cave jump (hard)");
1037+
return(88, agility_contortion_6516, "Karuulm Dungeon pipe");
10381038
case 88 :
1039+
return(89, agility_jump_6514, "Revenant cave jump (hard)");
1040+
case 89 :
10391041
return(91, agility_climb_6517, "Viyeldi Caves cliff climb");
10401042
}
10411043
case 3 :

Diff for: ‎scripts/[proc,slayer_rewards_etcetera_draw].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ def_int $int6 = 0;
44
def_int $int7 = 0;
55
def_int $int8 = 0;
66
def_int $int9 = enum(int, int, enum_273, $int8);
7-
while ($int9 ! -1 & $int9 <= 50) {
7+
while ($int9 ! -1 & $int9 <= 51) {
88
if (($int9 < 32 & testbit(%var1076, $int9) = ^false | $int9 >= 32 & testbit(%var1344, calc($int9 % 32)) = ^false) & ~script3689(%varbit10032, $int9) = 0) {
99
$int6, $int7 = calc($int6 + 1), calc($int7 + enum(int, int, enum_836, $int9));
1010
}
@@ -37,7 +37,7 @@ if ($int6 > 0 & $int7 > 0) {
3737
if_setonmouserepeat("options_button_on(event_com, 0)", $component0);
3838
if_setonmouseleave("options_button_off(event_com, 0)", $component0);
3939
if_setop(1, "Extend", $component0);
40-
if_setonop("slayer_rewards_unlock_confirm(null, calc(50 + 9), $string1, $component1, $component2, $component3, $component4, $component5, $int7)", $component0);
40+
if_setonop("slayer_rewards_unlock_confirm(null, calc(51 + 9), $string1, $component1, $component2, $component3, $component4, $component5, $int7)", $component0);
4141
} else {
4242
cc_setcolour(0x7f4c0f);
4343
cc_settext($string0);

Diff for: ‎scripts/[proc,slayer_rewards_tasks_blocked_draw].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if ($int1 = 1) {
1818
} else {
1919
return;
2020
}
21-
$int9 = calc(50 + $int9);
21+
$int9 = calc(51 + $int9);
2222
def_int $int10 = 0;
2323
cc_create($component0, ^iftype_text, $int10);
2424
$int10 = calc($int10 + 1);

Diff for: ‎scripts/[proc,slayer_rewards_tasks_currenttask].cs2

+91-27
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,130 @@
11
// 422
2-
[proc,slayer_rewards_tasks_currenttask](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6)
2+
[proc,slayer_rewards_tasks_currenttask](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
3+
if (%varbit12442 = 1) {
4+
if_settext("You may spend points to <col=ffffff>Cancel</col> or <col=ffffff>Block</col> your current task.<br>If you <col=ffffff>cancel</col> it, you may be assigned that target again in future. <col=ff0000>(<tostring(30)> points)</col><br>If you <col=ffffff>block</col> it, you will not get that assignment again. <col=ff0000>(<tostring(100)> points)</col><br>You may also <col=ffffff>store</col> your current task for later. <col=ff0000>(<tostring(50)> points)</col>", $component1);
5+
} else {
6+
if_settext("You may spend points to <col=ffffff>Cancel</col> or <col=ffffff>Block</col> your current task.<br>If you <col=ffffff>cancel</col> it, you may be assigned that target again in future. <col=ff0000>(<tostring(30)> points)</col><br>If you <col=ffffff>block</col> it, you will not get that assignment again. <col=ff0000>(<tostring(100)> points)</col><br><col=ffffff>Neither</col> option will reset your current tally of completed Slayer tasks.", $component1);
7+
}
38
cc_deleteall($component0);
4-
def_int $int7 = 0;
5-
def_int $int8 = 0;
9+
def_int $int9 = 0;
10+
def_int $int10 = 0;
611
def_string $string0 = "Creature";
712
if (%var262 = 98) {
813
if (%var261 > 0) {
9-
$int8, $string0 = 1, enum(int, string, enum_1174, %var263);
10-
if_settext("<tostring(%var261)> x <$string0>", $component1);
14+
$int10, $string0 = 1, enum(int, string, enum_1174, %var263);
15+
if_settext("<tostring(%var261)> x <$string0>", $component2);
1116
} else if (%var261 = -1) {
12-
$int8, $string0 = 1, enum(int, string, enum_1174, %var263);
13-
if_settext($string0, $component1);
17+
$int10, $string0 = 1, enum(int, string, enum_1174, %var263);
18+
if_settext($string0, $component2);
1419
} else {
15-
if_settext("None", $component1);
20+
if_settext("None", $component2);
1621
}
1722
} else if (%var261 > 0 & %var262 ! 0) {
18-
$int8, $string0 = 1, enum(int, string, enum_693, %var262);
19-
if_settext("<tostring(%var261)> x <$string0>", $component1);
23+
$int10, $string0 = 1, enum(int, string, enum_693, %var262);
24+
if_settext("<tostring(%var261)> x <$string0>", $component2);
25+
} else {
26+
if_settext("None", $component2);
27+
}
28+
def_int $int11 = 0;
29+
def_string $string1 = "Creature";
30+
if (%var265 = 98) {
31+
if (%var264 > 0) {
32+
$int11, $string1 = 1, enum(int, string, enum_1174, %var266);
33+
if_settext("<tostring(%var264)> x <$string1>", $component8);
34+
if_setcolour(^white, $component8);
35+
} else if (%var264 = -1) {
36+
$int11, $string1 = 1, enum(int, string, enum_1174, %var266);
37+
if_settext($string1, $component8);
38+
if_setcolour(^white, $component8);
39+
} else {
40+
if_settext("No stored task", $component8);
41+
if_setcolour(0x9f9f9f, $component8);
42+
}
43+
} else if (%var264 > 0 & %var265 ! 0) {
44+
$int11, $string1 = 1, enum(int, string, enum_693, %var265);
45+
if_settext("<tostring(%var264)> x <$string1>", $component8);
46+
if_setcolour(^white, $component8);
2047
} else {
21-
if_settext("None", $component1);
48+
if_settext("No stored task", $component8);
49+
if_setcolour(0x9f9f9f, $component8);
2250
}
23-
cc_create($component0, ^iftype_graphic, $int7);
24-
$int7 = calc($int7 + 1);
25-
.cc_create($component0, ^iftype_text, $int7);
26-
$int7 = calc($int7 + 1);
51+
cc_create($component0, ^iftype_graphic, $int9);
52+
$int9 = calc($int9 + 1);
53+
.cc_create($component0, ^iftype_text, $int9);
54+
$int9 = calc($int9 + 1);
2755
cc_setsize(85, 22, ^setsize_abs, ^setsize_abs);
2856
.cc_setsize(85, 22, ^setsize_abs, ^setsize_abs);
29-
cc_setposition(275, 62, ^setpos_abs_left, ^setpos_abs_top);
30-
.cc_setposition(275, 62, ^setpos_abs_left, ^setpos_abs_top);
57+
cc_setposition(218, 47, ^setpos_abs_left, ^setpos_abs_top);
58+
.cc_setposition(218, 47, ^setpos_abs_left, ^setpos_abs_top);
3159
cc_setgraphic("combatboxesmed,0");
3260
.cc_settextfont(p11_full);
3361
.cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
3462
.cc_settextshadow(true);
3563
.cc_settext("Cancel task");
36-
if ($int8 = 1) {
64+
if ($int10 = 1) {
3765
.cc_setcolour(0xff981f);
3866
cc_setonmouseover("cc_colour_swapper(event_com, .cc_getid, ^white)");
3967
cc_setonmouseleave("cc_colour_swapper(event_com, .cc_getid, 0xff981f)");
4068
cc_setop(1, "Cancel");
41-
cc_setonop("slayer_rewards_tasks_canceltask($string0, false, $component2, $component3, $component4, $component5, $component6)");
69+
cc_setonop("slayer_rewards_tasks_canceltask($string0, 1, $component3, $component4, $component5, $component6, $component7)");
4270
} else {
4371
.cc_setcolour(0x7f4c0f);
4472
}
45-
cc_create($component0, ^iftype_graphic, $int7);
46-
$int7 = calc($int7 + 1);
47-
.cc_create($component0, ^iftype_text, $int7);
48-
$int7 = calc($int7 + 1);
73+
cc_create($component0, ^iftype_graphic, $int9);
74+
$int9 = calc($int9 + 1);
75+
.cc_create($component0, ^iftype_text, $int9);
76+
$int9 = calc($int9 + 1);
4977
cc_setsize(85, 22, ^setsize_abs, ^setsize_abs);
5078
.cc_setsize(85, 22, ^setsize_abs, ^setsize_abs);
51-
cc_setposition(375, 62, ^setpos_abs_left, ^setpos_abs_top);
52-
.cc_setposition(375, 62, ^setpos_abs_left, ^setpos_abs_top);
79+
cc_setposition(301, 47, ^setpos_abs_left, ^setpos_abs_top);
80+
.cc_setposition(301, 47, ^setpos_abs_left, ^setpos_abs_top);
5381
cc_setgraphic("combatboxesmed,0");
5482
.cc_settextfont(p11_full);
5583
.cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
5684
.cc_settextshadow(true);
5785
.cc_settext("Block task");
58-
if ($int8 = 1 & %var262 ! 97 & %var262 ! 105 & %var262 ! 98) {
86+
if ($int10 = 1 & %var262 ! 97 & %var262 ! 105 & %var262 ! 98) {
5987
.cc_setcolour(0xff981f);
6088
cc_setonmouseover("cc_colour_swapper(event_com, .cc_getid, ^white)");
6189
cc_setonmouseleave("cc_colour_swapper(event_com, .cc_getid, 0xff981f)");
6290
cc_setop(1, "Block");
63-
cc_setonop("slayer_rewards_tasks_canceltask($string0, true, $component2, $component3, $component4, $component5, $component6)");
91+
cc_setonop("slayer_rewards_tasks_canceltask($string0, 2, $component3, $component4, $component5, $component6, $component7)");
92+
} else {
93+
.cc_setcolour(0x7f4c0f);
94+
}
95+
cc_create($component0, ^iftype_graphic, $int9);
96+
$int9 = calc($int9 + 1);
97+
.cc_create($component0, ^iftype_text, $int9);
98+
$int9 = calc($int9 + 1);
99+
cc_setsize(85, 22, ^setsize_abs, ^setsize_abs);
100+
.cc_setsize(85, 22, ^setsize_abs, ^setsize_abs);
101+
cc_setposition(384, 47, ^setpos_abs_left, ^setpos_abs_top);
102+
.cc_setposition(384, 47, ^setpos_abs_left, ^setpos_abs_top);
103+
cc_setgraphic("combatboxesmed,0");
104+
.cc_settextfont(p11_full);
105+
.cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
106+
.cc_settextshadow(true);
107+
if ($int11 = 1) {
108+
.cc_settext("Unstore task");
109+
} else {
110+
.cc_settext("Store task");
111+
}
112+
if (%varbit12442 = 1) {
113+
if ($int10 = 1 & $int11 = 0) {
114+
.cc_setcolour(0xff981f);
115+
cc_setonmouseover("cc_colour_swapper(event_com, .cc_getid, ^white)");
116+
cc_setonmouseleave("cc_colour_swapper(event_com, .cc_getid, 0xff981f)");
117+
cc_setop(1, "Store");
118+
cc_setonop("slayer_rewards_tasks_canceltask($string0, 10, $component3, $component4, $component5, $component6, $component7)");
119+
} else if ($int10 = 0 & $int11 = 1) {
120+
.cc_setcolour(0xff981f);
121+
cc_setonmouseover("cc_colour_swapper(event_com, .cc_getid, ^white)");
122+
cc_setonmouseleave("cc_colour_swapper(event_com, .cc_getid, 0xff981f)");
123+
cc_setop(1, "Unstore");
124+
cc_setonop("slayer_rewards_tasks_canceltask($string1, 11, $component3, $component4, $component5, $component6, $component7)");
125+
} else {
126+
.cc_setcolour(0x7f4c0f);
127+
}
64128
} else {
65129
.cc_setcolour(0x7f4c0f);
66130
}

Diff for: ‎scripts/[proc,slayer_rewards_unlock_draw].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def_string $text1 = "";
1717
def_string $string2 = "";
1818
def_int $int19 = 0;
1919
def_int $int20 = enum(int, int, $enum0, $int19);
20-
while ($int20 ! -1 & $int20 <= 50) {
20+
while ($int20 ! -1 & $int20 <= 51) {
2121
$text1 = enum(int, string, enum_834, $int20);
2222
$string2 = ~slayer_rewards_unlock_desc($int20);
2323
$string0 = "<$string2> <col=ff0000>(<tostring(enum(int, int, enum_836, $int20))> points)</col>";

0 commit comments

Comments
 (0)