Skip to content
This repository was archived by the owner on Feb 4, 2025. It is now read-only.

Commit 07331f5

Browse files
committed
212.0
1 parent f1f6608 commit 07331f5

File tree

56 files changed

+611
-331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+611
-331
lines changed

README.md

+23-7
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
[**356**](scripts/[proc,stonepanel_blue].cs2) `[proc,stonepanel_blue]`
360360
[**357**](scripts/[clientscript,stonepanel_red].cs2) `[clientscript,stonepanel_red]`
361361
[**358**](scripts/[proc,stonepanel_red].cs2) `[proc,stonepanel_red]`
362-
[**359**](scripts/[proc,script359].cs2)
362+
[**359**](scripts/[clientscript,script359].cs2)
363363
[**360**](scripts/[clientscript,script360].cs2)
364364
[**361**](scripts/[clientscript,soul_wars_game_hud_init].cs2) `[clientscript,soul_wars_game_hud_init]`
365365
[**362**](scripts/[clientscript,soul_wars_game_hud_update].cs2) `[clientscript,soul_wars_game_hud_update]`
@@ -547,7 +547,7 @@
547547
[**544**](scripts/[proc,league_reward_draw_item].cs2) `[proc,league_reward_draw_item]`
548548
[**545**](scripts/[clientscript,wear_updateslot].cs2) `[clientscript,wear_updateslot]`
549549
[**546**](scripts/[proc,wear_updateslot].cs2) `[proc,wear_updateslot]`
550-
[**547**](scripts/[clientscript,runweight_visible].cs2) `[clientscript,runweight_visible]`
550+
[**547**](scripts/[proc,script547].cs2)
551551
[**548**](scripts/[proc,meslayer_mode12].cs2) `[proc,meslayer_mode12]`
552552
[**549**](scripts/[proc,meslayer_mode12_setprompt].cs2) `[proc,meslayer_mode12_setprompt]`
553553
[**550**](scripts/[proc,meslayer_mode13].cs2) `[proc,meslayer_mode13]`
@@ -2567,6 +2567,8 @@
25672567
[**2564**](scripts/[clientscript,membership_benefits_close_benefit_hover].cs2) `[clientscript,membership_benefits_close_benefit_hover]`
25682568
[**2565**](scripts/[clientscript,membership_benefits_close_benefit].cs2) `[clientscript,membership_benefits_close_benefit]`
25692569
[**2566**](scripts/[clientscript,script2566].cs2)
2570+
[**2567**](scripts/[clientscript,script2567].cs2)
2571+
[**2568**](scripts/[clientscript,script2568].cs2)
25702572
[**2569**](scripts/[proc,membership_benefits_prompt_button_init].cs2) `[proc,membership_benefits_prompt_button_init]`
25712573
[**2570**](scripts/[clientscript,membership_benefits_prompt_button_draw].cs2) `[clientscript,membership_benefits_prompt_button_draw]`
25722574
[**2571**](scripts/[proc,membership_benefits_prompt_button_draw].cs2) `[proc,membership_benefits_prompt_button_draw]`
@@ -2756,8 +2758,7 @@
27562758
[**2755**](scripts/[proc,wint_timer_resynch].cs2) `[proc,wint_timer_resynch]`
27572759
[**2756**](scripts/[clientscript,wint_timer_countdown].cs2) `[clientscript,wint_timer_countdown]`
27582760
[**2757**](scripts/[proc,wint_timer_countdown].cs2) `[proc,wint_timer_countdown]`
2759-
[**2758**](scripts/[proc,prayer_infobutton].cs2) `[proc,prayer_infobutton]`
2760-
[**2759**](scripts/[clientscript,prayer_infomode].cs2) `[clientscript,prayer_infomode]`
2761+
[**2758**](scripts/[proc,script2758].cs2)
27612762
[**2760**](scripts/[clientscript,prayer_levelupdate].cs2) `[clientscript,prayer_levelupdate]`
27622763
[**2761**](scripts/[proc,prayer_levelupdate].cs2) `[proc,prayer_levelupdate]`
27632764
[**2762**](scripts/[proc,prayer_gettooltiptext].cs2) `[proc,prayer_gettooltiptext]`
@@ -2792,7 +2793,7 @@
27922793
[**2791**](scripts/[proc,skill_guide_data_magic].cs2) `[proc,skill_guide_data_magic]`
27932794
[**2792**](scripts/[proc,orbs_spec_draw_button].cs2) `[proc,orbs_spec_draw_button]`
27942795
[**2793**](scripts/[clientscript,orbs_toggle_spec_op].cs2) `[clientscript,orbs_toggle_spec_op]`
2795-
[**2794**](scripts/[clientscript,orbs_blocked_spec_op].cs2) `[clientscript,orbs_blocked_spec_op]`
2796+
[**2794**](scripts/[clientscript,script2794].cs2)
27962797
[**2795**](scripts/[clientscript,itemsets_info_init].cs2) `[clientscript,itemsets_info_init]`
27972798
[**2796**](scripts/[clientscript,script2796].cs2)
27982799
[**2797**](scripts/[clientscript,journal_list_init].cs2) `[clientscript,journal_list_init]`
@@ -3151,6 +3152,12 @@
31513152
[**3150**](scripts/[proc,script3150].cs2)
31523153
[**3151**](scripts/[clientscript,boardgames_draughts_options_update_selections].cs2) `[clientscript,boardgames_draughts_options_update_selections]`
31533154
[**3152**](scripts/[proc,boardgames_draughts_options_update_selections].cs2) `[proc,boardgames_draughts_options_update_selections]`
3155+
[**3153**](scripts/[proc,script3153].cs2)
3156+
[**3154**](scripts/[proc,script3154].cs2)
3157+
[**3155**](scripts/[clientscript,script3155].cs2)
3158+
[**3156**](scripts/[proc,script3156].cs2)
3159+
[**3157**](scripts/[clientscript,script3157].cs2)
3160+
[**3158**](scripts/[proc,script3158].cs2)
31543161
[**3159**](scripts/[proc,script3159].cs2)
31553162
[**3160**](scripts/[proc,league_world].cs2) `[proc,league_world]`
31563163
[**3161**](scripts/[clientscript,clear_chat_all].cs2) `[clientscript,clear_chat_all]`
@@ -3299,6 +3306,9 @@
32993306
[**3304**](scripts/[clientscript,wiki_icon_init].cs2) `[clientscript,wiki_icon_init]`
33003307
[**3305**](scripts/[clientscript,wiki_icon_update].cs2) `[clientscript,wiki_icon_update]`
33013308
[**3306**](scripts/[proc,wiki_icon_update].cs2) `[proc,wiki_icon_update]`
3309+
[**3307**](scripts/[clientscript,script3307].cs2)
3310+
[**3308**](scripts/[proc,script3308].cs2)
3311+
[**3309**](scripts/[proc,script3309].cs2)
33023312
[**3310**](scripts/[proc,summary_sidepanel_draw].cs2) `[proc,summary_sidepanel_draw]`
33033313
[**3311**](scripts/[clientscript,nightmare_totems_init].cs2) `[clientscript,nightmare_totems_init]`
33043314
[**3312**](scripts/[clientscript,nightmare_totem_hud_fade_in].cs2) `[clientscript,nightmare_totem_hud_fade_in]`
@@ -3641,7 +3651,11 @@
36413651
[**3649**](scripts/[clientscript,script3649].cs2)
36423652
[**3650**](scripts/[clientscript,bondif_init].cs2) `[clientscript,bondif_init]`
36433653
[**3651**](scripts/[clientscript,script3651].cs2)
3654+
[**3652**](scripts/[proc,script3652].cs2)
3655+
[**3653**](scripts/[clientscript,script3653].cs2)
3656+
[**3654**](scripts/[proc,script3654].cs2)
36443657
[**3655**](scripts/[clientscript,script3655].cs2)
3658+
[**3656**](scripts/[proc,script3656].cs2)
36453659
[**3657**](scripts/[clientscript,trailblazer_areas_init].cs2) `[clientscript,trailblazer_areas_init]`
36463660
[**3658**](scripts/[proc,league_areas_draw_interface].cs2) `[proc,league_areas_draw_interface]`
36473661
[**3659**](scripts/[proc,script3659].cs2)
@@ -4532,6 +4546,7 @@
45324546
[**4544**](scripts/[loadnpc,_category_1513].cs2) `[loadnpc,_category_1513]`
45334547
[**4545**](scripts/[loadnpc,_category_1514].cs2) `[loadnpc,_category_1514]`
45344548
[**4546**](scripts/[loadnpc,_category_1533].cs2) `[loadnpc,_category_1533]`
4549+
[**4547**](scripts/[proc,script4547].cs2)
45354550
[**4548**](scripts/[clientscript,fishing_spot_indicator_vartransmit].cs2) `[clientscript,fishing_spot_indicator_vartransmit]`
45364551
[**4549**](scripts/[clientscript,fishing_spot_indicator_invtransmit].cs2) `[clientscript,fishing_spot_indicator_invtransmit]`
45374552
[**4550**](scripts/[clientscript,fishing_spot_indicator_stattransmit].cs2) `[clientscript,fishing_spot_indicator_stattransmit]`
@@ -4545,6 +4560,7 @@
45454560
[**4558**](scripts/[proc,script4558].cs2)
45464561
[**4559**](scripts/[clientscript,fishing_spot_indicator_tile_setup].cs2) `[clientscript,fishing_spot_indicator_tile_setup]`
45474562
[**4560**](scripts/[proc,fishing_spot_indicator_tile_setup].cs2) `[proc,fishing_spot_indicator_tile_setup]`
4563+
[**4561**](scripts/[proc,script4561].cs2)
45484564
[**4562**](scripts/[clientscript,script4562].cs2)
45494565
[**4563**](scripts/[proc,script4563].cs2)
45504566
[**4564**](scripts/[clientscript,settings_player_attack_options].cs2) `[clientscript,settings_player_attack_options]`
@@ -5175,6 +5191,7 @@
51755191
[**5189**](scripts/[proc,script5189].cs2)
51765192
[**5190**](scripts/[proc,settings_minimap_lock].cs2) `[proc,settings_minimap_lock]`
51775193
[**5191**](scripts/[clientscript,settings_minimap_lock].cs2) `[clientscript,settings_minimap_lock]`
5194+
[**5192**](scripts/[clientscript,script5192].cs2)
51785195
[**5193**](scripts/[proc,settings_set_draw_distance].cs2) `[proc,settings_set_draw_distance]`
51795196
[**5194**](scripts/[proc,script5194].cs2)
51805197
[**5195**](scripts/[clientscript,script5195].cs2)
@@ -5326,8 +5343,6 @@
53265343
[**5341**](scripts/[proc,script5341].cs2)
53275344
[**5342**](scripts/[proc,script5342].cs2)
53285345
[**5343**](scripts/[proc,script5343].cs2)
5329-
[**5344**](scripts/[proc,script5344].cs2)
5330-
[**5345**](scripts/[proc,script5345].cs2)
53315346
[**5346**](scripts/[proc,script5346].cs2)
53325347
[**5347**](scripts/[proc,script5347].cs2)
53335348
[**5348**](scripts/[proc,helper_generic_set_bit].cs2) `[proc,helper_generic_set_bit]`
@@ -6049,6 +6064,7 @@
60496064
[**6064**](scripts/[clientscript,script6064].cs2)
60506065
[**6065**](scripts/[proc,script6065].cs2)
60516066
[**6066**](scripts/[proc,script6066].cs2)
6067+
[**6067**](scripts/[proc,script6067].cs2)
60526068
[**6069**](scripts/[proc,script6069].cs2)
60536069
[**6070**](scripts/[proc,raffle_tab_not_selected].cs2) `[proc,raffle_tab_not_selected]`
60546070
[**6071**](scripts/[proc,raffle_tab_selected].cs2) `[proc,raffle_tab_selected]`

scripts/[clientscript,orbs_blocked_spec_op].cs2

-6
This file was deleted.

scripts/[clientscript,prayer_flash_prayer].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 3403
2-
[clientscript,prayer_flash_prayer](int $int0)
3-
def_component $component1 = enum(int, component, enum_859, $int0);
2+
[clientscript,prayer_flash_prayer](obj $obj0)
3+
def_component $component1 = oc_param($obj0, param_1751);
44
if ($component1 = null) {
55
return;
66
}

scripts/[clientscript,prayer_infomode].cs2

-13
This file was deleted.
+13-73
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,22 @@
11
// 458
2-
[clientscript,prayer_init](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5)
3-
def_int $intarray0(calc(28 + 1));
4-
def_int $int6 = 0;
5-
def_component $component7 = null;
6-
def_int $int8 = 0;
2+
[clientscript,prayer_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
73
def_int $int9 = 0;
8-
def_int $int10 = 0;
9-
while ($int10 <= 28) {
10-
$component7 = enum(int, component, enum_859, $int10);
11-
if ($component7 ! null) {
12-
$intarray0($int6) = $int10;
13-
$int6 = calc($int6 + 1);
14-
cc_deleteall($component7);
15-
cc_create($component7, ^iftype_graphic, 0);
16-
cc_setsize(34, 34, ^setsize_abs, ^setsize_abs);
17-
cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
18-
cc_setgraphic("prayerglow");
19-
.cc_create($component7, ^iftype_graphic, 1);
20-
.cc_setsize(30, 30, ^setsize_abs, ^setsize_abs);
21-
.cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
22-
$int8, $int9 = cc_getid, .cc_getid;
23-
~prayer_updatebutton(false, $int10, $component7, $component2, $component5);
24-
}
25-
$int10 = calc($int10 + 1);
26-
}
27-
if ($int6 > 0) {
28-
~prayer_quicksort(intarray0, 0, calc($int6 - 1));
29-
}
30-
def_int $width11 = if_getwidth(enum(int, component, enum_859, 0));
31-
def_int $int12 = calc((if_getwidth($component2) - 5 * $width11) / 4 + $width11);
32-
def_int $int13 = 0;
33-
def_int $int14 = 0;
34-
while ($int14 < $int6) {
35-
$int13 = calc($int14 / 5 * $int12);
36-
if_setposition(calc($int14 % 5 * $int12), $int13, ^setpos_abs_left, ^setpos_abs_top, enum(int, component, enum_859, $intarray0($int14)));
37-
$int14 = calc($int14 + 1);
38-
}
39-
cc_deleteall($component1);
40-
cc_create($component1, ^iftype_graphic, 0);
41-
cc_setsize(17, 18, ^setsize_abs, ^setsize_abs);
42-
cc_setposition(0, 0, ^setpos_abs_left, ^setpos_abs_centre);
43-
cc_setgraphic("options_icons_small,2");
44-
.cc_create($component1, ^iftype_text, 1);
45-
.cc_setsize(24, 0, ^setsize_minus, ^setsize_minus);
46-
.cc_setposition(0, 0, ^setpos_abs_right, ^setpos_abs_centre);
47-
.cc_setcolour(0xff981f);
48-
.cc_settextalign(^settextalign_left, ^settextalign_centre, 0);
49-
.cc_settextshadow(true);
50-
.cc_settextfont(p12_full);
51-
~prayer_levelupdate;
52-
if_setonstattransmit("prayer_levelupdate(event_com, .cc_getid){prayer}", $component1);
53-
def_string $string0 = "Enter";
54-
def_boolean $boolean15 = true;
55-
def_string $string1 = "Dismiss";
56-
def_boolean $boolean16 = false;
57-
cc_deleteall($component4);
58-
if (~on_mobile = true) {
59-
if_setposition(-40, 5, ^setpos_abs_centre, ^setpos_abs_bottom, $component1);
60-
if_setposition(40, 5, ^setpos_abs_centre, ^setpos_abs_bottom, $component3);
61-
if_sethide(false, $component3);
62-
if_setopbase("<col=ff9040>Info mode</col>", $component3);
63-
if_setsize(0, calc(4 + $int13 + 34 + 4), ^setsize_minus, ^setsize_abs, $component4);
64-
$int10 = 0;
65-
while ($int10 < 4) {
66-
cc_create($component4, ^iftype_rectangle, $int10);
4+
def_boolean $boolean10 = ~on_mobile;
5+
def_string $string0 = "Info";
6+
def_string $string1 = "Filters";
7+
if ($boolean10 = true) {
8+
while ($int9 < 4) {
9+
cc_create($component4, ^iftype_rectangle, $int9);
6710
cc_sethide(false);
6811
cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
69-
cc_setsize(calc($int10 * 2), calc($int10 * 2), ^setsize_minus, ^setsize_minus);
12+
cc_setsize(calc($int9 * 2), calc($int9 * 2), ^setsize_minus, ^setsize_minus);
7013
cc_setcolour(^white);
7114
cc_settrans(220);
7215
cc_setfill(true);
73-
$int10 = calc($int10 + 1);
16+
$int9 = calc($int9 + 1);
7417
}
75-
~prayer_infobutton($string0, $boolean15, $string1, $boolean16, $component2, $int8, $int9, $component3, $component4, $component5);
76-
} else {
77-
if_setposition(0, 5, ^setpos_abs_centre, ^setpos_abs_bottom, $component1);
78-
if_sethide(true, $component3);
79-
if_setonop(null, $component3);
80-
if_clearops($component3);
81-
if_sethide(true, $component4);
8218
}
19+
~script3156(null, $boolean10, $component3, $component7, $component2, $component4, $component5, $component6, $component8, $string0, $string1);
20+
~script547($boolean10, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $string0, $string1);
21+
if_setonvartransmit("script359($boolean10, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $string0, $string1){var1377, var2900, var1050, var2972, var3109, var1429}", $component0);
22+
if_setonstattransmit("script359($boolean10, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $string0, $string1){prayer}", $component0);

scripts/[clientscript,prayer_op].cs2

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// 462
2-
[clientscript,prayer_op](int $opindex0, boolean $boolean1, int $int2, component $component3, int $comsubid4, int $comsubid5, component $component6, component $component7)
2+
[clientscript,prayer_op](int $opindex0, boolean $boolean1, obj $obj2, component $component3, component $component4, component $component5)
3+
def_int $index6 = oc_param($obj2, param_630);
34
if ($opindex0 = 1) {
4-
if ($boolean1 = false & cc_find($component3, $comsubid4) = ^true & .cc_find($component3, $comsubid5) = ^true) {
5-
if (testbit(%varbit4101, $int2) = ^true) {
6-
%varbit4101 = clearbit(%varbit4101, $int2);
7-
~prayer_updatebutton($boolean1, $int2, $component3, $component6, $component7);
5+
if ($boolean1 = false & cc_find($component3, 0) = ^true & .cc_find($component3, 1) = ^true) {
6+
if (testbit(%varbit4101, $index6) = ^true) {
7+
%varbit4101 = clearbit(%varbit4101, $index6);
8+
~prayer_updatebutton($boolean1, $obj2, $component3, $component4, $component5);
89
return;
910
}
10-
if (~prayer_isavailable($int2) = 0) {
11+
if (~prayer_isavailable($obj2) = 0) {
1112
sound_synth(prayer_off, 1, 0);
1213
return;
1314
}
@@ -16,14 +17,14 @@ if ($opindex0 = 1) {
1617
mes("You need to recharge your Prayer at an altar.");
1718
return;
1819
}
19-
%varbit4101 = setbit(%varbit4101, $int2);
20-
~prayer_updatebutton($boolean1, $int2, $component3, $component6, $component7);
20+
%varbit4101 = setbit(%varbit4101, $index6);
21+
~prayer_updatebutton($boolean1, $obj2, $component3, $component4, $component5);
2122
}
2223
} else if ($opindex0 = 2) {
23-
~deltooltip_action($component7);
24+
~deltooltip_action($component5);
2425
if ($boolean1 = true & %varcint218 ! $component3) {
2526
sound_synth(interface_select1, 1, 0);
26-
~tooltip_build($component3, -1, $component7, ~prayer_gettooltiptext($int2), if_getwidth($component6));
27+
~tooltip_build($component3, -1, $component5, ~prayer_gettooltiptext($obj2), if_getwidth($component4));
2728
%varcint218 = $component3;
2829
} else {
2930
%varcint218 = null;

scripts/[clientscript,prayer_stop_flash].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 3405
2-
[clientscript,prayer_stop_flash](int $int0)
3-
def_component $component1 = enum(int, component, enum_859, $int0);
2+
[clientscript,prayer_stop_flash](obj $obj0)
3+
def_component $component1 = oc_param($obj0, param_1751);
44
if ($component1 = null) {
55
return;
66
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// 461
2-
[clientscript,prayer_updatebutton](boolean $boolean0, int $int1, component $component2, int $comsubid3, int $comsubid4, component $component5, component $component6)
3-
if (cc_find($component2, $comsubid3) = ^true & .cc_find($component2, $comsubid4) = ^true) {
4-
~prayer_updatebutton($boolean0, $int1, $component2, $component5, $component6);
2+
[clientscript,prayer_updatebutton](boolean $boolean0, obj $obj1, component $component2, component $component3, component $component4)
3+
if (cc_find($component2, 0) = ^true & .cc_find($component2, 1) = ^true) {
4+
~prayer_updatebutton($boolean0, $obj1, $component2, $component3, $component4);
55
}
66
if ($boolean0 = false & %varbit5711 = 1) {
7-
~deltooltip_action($component6);
7+
~deltooltip_action($component4);
88
}
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
// 469
2-
[clientscript,quickprayer_button_op](int $opindex0, int $int1, component $component2, int $comsubid3, int $comsubid4)
2+
[clientscript,quickprayer_button_op](int $opindex0, obj $obj1, component $component2, int $comsubid3, int $comsubid4)
3+
def_int $index5 = oc_param($obj1, param_630);
34
if ($opindex0 = 1 & .cc_find($component2, $comsubid4) = ^true) {
4-
if (testbit(%varbit4102, $int1) = ^true) {
5-
%varbit4102 = clearbit(%varbit4102, $int1);
5+
if (testbit(%varbit4102, $index5) = ^true) {
6+
%varbit4102 = clearbit(%varbit4102, $index5);
67
} else {
7-
if (~prayer_isavailable($int1) = 0) {
8+
if (~prayer_isavailable($obj1) = 0) {
89
return;
910
}
10-
%varbit4102 = setbit(%varbit4102, $int1);
11+
%varbit4102 = setbit(%varbit4102, $index5);
1112
}
1213
sound_synth(interface_select1, 1, 0);
1314
if (cc_find($component2, $comsubid3) = ^true) {
14-
~quickprayer_button_update($int1);
15+
~quickprayer_button_update($obj1);
1516
}
1617
}
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// 470
2-
[clientscript,quickprayer_button_update](int $int0, component $component1, int $comsubid2, int $comsubid3)
2+
[clientscript,quickprayer_button_update](obj $obj0, component $component1, int $comsubid2, int $comsubid3)
33
if (cc_find($component1, $comsubid2) = ^true & .cc_find($component1, $comsubid3) = ^true) {
4-
~quickprayer_button_update($int0);
4+
~quickprayer_button_update($obj0);
55
}
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// 467
2-
[clientscript,quickprayer_icon_update](int $int0, component $component1, int $comsubid2)
2+
[clientscript,quickprayer_icon_update](obj $obj0, component $component1, int $comsubid2)
33
if (.cc_find($component1, $comsubid2) = ^true) {
4-
~quickprayer_icon_update($int0);
4+
~quickprayer_icon_update($obj0);
55
}

0 commit comments

Comments
 (0)