diff --git a/README.md b/README.md index f4d3fb374..49eef27a3 100644 --- a/README.md +++ b/README.md @@ -3165,6 +3165,10 @@ [**3162**](scripts/[clientscript,league_icon_flash].cs2) `[clientscript,league_icon_flash]` [**3163**](scripts/[clientscript,league_flash_timer].cs2) `[clientscript,league_flash_timer]` [**3164**](scripts/[proc,league_flashicon].cs2) `[proc,league_flashicon]` +[**3165**](scripts/[proc,script3165].cs2) +[**3166**](scripts/[clientscript,script3166].cs2) +[**3167**](scripts/[clientscript,script3167].cs2) +[**3168**](scripts/[proc,script3168].cs2) [**3169**](scripts/[proc,buff_bar_buff_create_tooltip].cs2) `[proc,buff_bar_buff_create_tooltip]` [**3170**](scripts/[clientscript,buff_bar_mobile_tooltip].cs2) `[clientscript,buff_bar_mobile_tooltip]` [**3171**](scripts/[clientscript,buff_bar_mobile_tooltip_remove].cs2) `[clientscript,buff_bar_mobile_tooltip_remove]` @@ -3195,6 +3199,7 @@ [**3196**](scripts/[clientscript,league_relic_back].cs2) `[clientscript,league_relic_back]` [**3197**](scripts/[clientscript,league_relic_confirm].cs2) `[clientscript,league_relic_confirm]` [**3198**](scripts/[clientscript,league_relic_confirm_back].cs2) `[clientscript,league_relic_confirm_back]` +[**3199**](scripts/[clientscript,script3199].cs2) [**3200**](scripts/[clientscript,clock_init].cs2) `[clientscript,clock_init]` [**3201**](scripts/[clientscript,script3201].cs2) [**3202**](scripts/[clientscript,league_tasks_init].cs2) `[clientscript,league_tasks_init]` @@ -3691,6 +3696,7 @@ [**3693**](scripts/[proc,leagues_menu_button].cs2) `[proc,leagues_menu_button]` [**3694**](scripts/[proc,league_relic_hover].cs2) `[proc,league_relic_hover]` [**3695**](scripts/[proc,league_relic_button_hover].cs2) `[proc,league_relic_button_hover]` +[**3696**](scripts/[proc,script3696].cs2) [**3697**](scripts/[proc,league_relic_active].cs2) `[proc,league_relic_active]` [**3698**](scripts/[clientscript,script3698].cs2) [**3699**](scripts/[proc,league_task_display].cs2) `[proc,league_task_display]` @@ -4658,6 +4664,7 @@ [**4661**](scripts/[proc,helper_cox_timer_convert].cs2) `[proc,helper_cox_timer_convert]` [**4662**](scripts/[clientscript,raids_overlay_content_transmit].cs2) `[clientscript,raids_overlay_content_transmit]` [**4663**](scripts/[proc,raids_overlay_content].cs2) `[proc,raids_overlay_content]` +[**4664**](scripts/[clientscript,script4664].cs2) [**4665**](scripts/[clientscript,script4665].cs2) [**4666**](scripts/[proc,script4666].cs2) [**4667**](scripts/[proc,buff_bar_time_string].cs2) `[proc,buff_bar_time_string]` @@ -4666,12 +4673,20 @@ [**4670**](scripts/[proc,buff_bar_position_init].cs2) `[proc,buff_bar_position_init]` [**4671**](scripts/[clientscript,buff_bar_position_review].cs2) `[clientscript,buff_bar_position_review]` [**4672**](scripts/[proc,buff_bar_position_review].cs2) `[proc,buff_bar_position_review]` +[**4673**](scripts/[clientscript,script4673].cs2) [**4674**](scripts/[proc,script4674].cs2) [**4675**](scripts/[proc,script4675].cs2) [**4676**](scripts/[proc,script4676].cs2) [**4677**](scripts/[clientscript,script4677].cs2) [**4678**](scripts/[proc,script4678].cs2) +[**4679**](scripts/[proc,script4679].cs2) +[**4680**](scripts/[clientscript,script4680].cs2) +[**4681**](scripts/[proc,script4681].cs2) +[**4682**](scripts/[clientscript,script4682].cs2) +[**4683**](scripts/[clientscript,script4683].cs2) [**4684**](scripts/[proc,buff_bar_buff_disabled].cs2) `[proc,buff_bar_buff_disabled]` +[**4685**](scripts/[clientscript,script4685].cs2) +[**4686**](scripts/[clientscript,script4686].cs2) [**4687**](scripts/[proc,script4687].cs2) [**4688**](scripts/[proc,helper_init].cs2) `[proc,helper_init]` [**4689**](scripts/[clientscript,helper_setup].cs2) `[clientscript,helper_setup]` @@ -5325,6 +5340,8 @@ [**5337**](scripts/[proc,settings_bird_nest_notification].cs2) `[proc,settings_bird_nest_notification]` [**5338**](scripts/[proc,script5338].cs2) [**5339**](scripts/[proc,on_mac].cs2) `[proc,on_mac]` +[**5340**](scripts/[proc,script5340].cs2) +[**5341**](scripts/[proc,script5341].cs2) [**5346**](scripts/[proc,script5346].cs2) [**5347**](scripts/[proc,script5347].cs2) [**5348**](scripts/[proc,helper_generic_set_bit].cs2) `[proc,helper_generic_set_bit]` diff --git a/scripts/[clientscript,build_makeover_feet].cs2 b/scripts/[clientscript,build_makeover_feet].cs2 index 6a2aa0f61..926321c6f 100644 --- a/scripts/[clientscript,build_makeover_feet].cs2 +++ b/scripts/[clientscript,build_makeover_feet].cs2 @@ -1,27 +1,4 @@ // 3601 -[clientscript,build_makeover_feet](component $component0, component $component1, component $component2) +[clientscript,build_makeover_feet](component $component0, component $component1, component $component2, component $component3) ~steelborder($component0, "Yrsa's Shoe Store", 0); -def_int $count3 = enum_getoutputcount(enum_3314); -def_int $int4 = 0; -def_int $int5 = 0; -def_int $int6 = 20; -def_int $int7 = 60; -while ($int4 < $count3) { - ~makeover_feet_add_option($int4, $int5, $int6, $int7, $component1, $component2); - if ($int4 ! 0 & calc(($int4 + 1) % 3) = 0) { - $int7 = 60; - $int6 = calc($int6 + 100); - } else { - $int7 = calc($int7 + 120); - } - $int4 = calc($int4 + 1); - $int5 = calc($int5 + 1); -} -cc_create($component2, ^iftype_text, $count3); -cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); -cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); -cc_setcolour(0xff981f); -cc_settextfont(b12_full); -cc_settextshadow(true); -cc_settextalign(^settextalign_centre, ^settextalign_centre, 10); -cc_settext("Select a new pair of shoes."); +~script3165($component1, $component2, $component3, -1); diff --git a/scripts/[clientscript,clan_permission_init].cs2 b/scripts/[clientscript,clan_permission_init].cs2 index 0e3f36a8f..74d802ce4 100644 --- a/scripts/[clientscript,clan_permission_init].cs2 +++ b/scripts/[clientscript,clan_permission_init].cs2 @@ -20,7 +20,11 @@ while ($count15 < $count13) { if ($enum11 ! null) { $struct12 = enum(int, struct, $enum11, -1); if ($struct12 ! null) { - $string0 = struct_param($struct12, param_1251); + if (struct_param($struct12, param_1551) = true) { + $string0 = struct_param($struct12, param_1552); + } else { + $string0 = struct_param($struct12, param_1251); + } $int10 = ~max($int10, calc(parawidth($string0, 512, p12_full) + 22 + 6)); } $int14 = calc($int14 + enum_getoutputcount($enum11) - 1); @@ -64,7 +68,7 @@ while ($count15 < $count13) { if ($enum11 ! null) { $struct12 = enum(int, struct, $enum11, -1); if ($struct12 ! null) { - $int20, $int18 = ~clan_permissions_categorytitle($int20, $int23, struct_param($struct12, param_1251), $component7, $component4, $int18, $component8, $count15, $int19); + $int20, $int18 = ~clan_permissions_categorytitle($int20, $int23, struct_param($struct12, param_1251), $component7, $component4, $int18, $component8, $count15, $int19, struct_param($struct12, param_1551), struct_param($struct12, param_1552)); $int23 = calc($int23 + 25 + 6); } $int17, $int25 = 0, calc(enum_getoutputcount($enum11) - 1); diff --git a/scripts/[clientscript,gim_settings_draw].cs2 b/scripts/[clientscript,gim_settings_draw].cs2 index 18cde22eb..2e63b9ca5 100644 --- a/scripts/[clientscript,gim_settings_draw].cs2 +++ b/scripts/[clientscript,gim_settings_draw].cs2 @@ -1,3 +1,3 @@ // 5503 -[clientscript,gim_settings_draw](component $component0, int $comsubid1, component $component2, int $comsubid3, component $component4, component $component5, component $component6, component $component7, component $component8) -~gim_settings_draw($component0, $comsubid1, $component2, $comsubid3, $component4, $component5, $component6, $component7, $component8); +[clientscript,gim_settings_draw](component $component0, int $comsubid1, component $component2, int $comsubid3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9) +~gim_settings_draw($component0, $comsubid1, $component2, $comsubid3, $component4, $component5, $component6, $component7, $component8, $component9); diff --git a/scripts/[clientscript,gim_settings_init].cs2 b/scripts/[clientscript,gim_settings_init].cs2 index 12ead9573..7ba2eeaad 100644 --- a/scripts/[clientscript,gim_settings_init].cs2 +++ b/scripts/[clientscript,gim_settings_init].cs2 @@ -1,6 +1,6 @@ // 5502 -[clientscript,gim_settings_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7) -def_int $comsubid8 = ~steelborder($component1, "", 1); +[clientscript,gim_settings_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8) +def_int $comsubid9 = ~steelborder($component1, "", 1); cc_deleteall($component2); cc_create($component2, ^iftype_text, 0); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); @@ -10,10 +10,11 @@ cc_settextfont(p12_full); cc_settextalign(^settextalign_centre, ^settextalign_centre, 0); cc_settextshadow(true); cc_settext("Loading..."); -def_int $comsubid9 = cc_getid; -~gim_settings_draw($component1, $comsubid8, $component2, $comsubid9, $component3, $component4, $component5, $component6, $component7); -if_setonvartransmit("gim_settings_draw($component1, $comsubid8, $component2, $comsubid9, $component3, $component4, $component5, $component6, $component7){var3172}", $component0); -if_setonclansettingstransmit("gim_settings_draw($component1, $comsubid8, $component2, $comsubid9, $component3, $component4, $component5, $component6, $component7)", $component0); +def_int $comsubid10 = cc_getid; +~gim_settings_draw($component1, $comsubid9, $component2, $comsubid10, $component3, $component4, $component5, $component6, $component7, $component8); +if_setonvartransmit("gim_settings_draw($component1, $comsubid9, $component2, $comsubid10, $component3, $component4, $component5, $component6, $component7, $component8){var3172}", $component0); +if_setonclansettingstransmit("gim_settings_draw($component1, $comsubid9, $component2, $comsubid10, $component3, $component4, $component5, $component6, $component7, $component8)", $component0); if_setonop("opsound(event_opindex, 2)", $component5); if_setonop("opsound(event_opindex, 2)", $component6); if_setonop("opsound(event_opindex, 2)", $component7); +if_setonop("opsound(event_opindex, 2)", $component8); diff --git a/scripts/[clientscript,makeover_feet_select].cs2 b/scripts/[clientscript,makeover_feet_select].cs2 index 826eaeaff..a2afd39ff 100644 --- a/scripts/[clientscript,makeover_feet_select].cs2 +++ b/scripts/[clientscript,makeover_feet_select].cs2 @@ -1,27 +1,27 @@ // 3602 -[clientscript,makeover_feet_select](int $comsubid0, component $component1, component $component2) -def_int $count3 = enum_getoutputcount(enum_3314); -def_int $int4 = 0; +[clientscript,makeover_feet_select](int $comsubid0, component $component1, component $component2, enum $enum3) +def_int $count4 = enum_getoutputcount($enum3); def_int $int5 = 0; +def_int $int6 = 0; if (cc_find($component1, $comsubid0) = ^true) { - $int4 = cc_getx; - $int5 = cc_gety; - cc_create($component1, ^iftype_graphic, $count3); + $int5 = cc_getx; + $int6 = cc_gety; + cc_create($component1, ^iftype_graphic, $count4); cc_setgraphic("tick"); cc_setsize(20, 20, ^setsize_abs, ^setsize_abs); - cc_setposition(calc($int4 + 50), calc($int5 + 50), ^setpos_abs_left, ^setpos_abs_top); + cc_setposition(calc($int5 + 50), calc($int6 + 50), ^setpos_abs_left, ^setpos_abs_top); } -if (cc_find($component2, $count3) = ^true) { +if (cc_find($component2, $count4) = ^true) { cc_delete; } -def_int $count6 = 0; -while ($count6 < $count3) { - if (cc_find($component2, $count6) = ^true) { +def_int $count7 = 0; +while ($count7 < $count4) { + if (cc_find($component2, $count7) = ^true) { if (cc_getid = $comsubid0) { cc_sethide(false); } else { cc_sethide(true); } } - $count6 = calc($count6 + 1); + $count7 = calc($count7 + 1); } diff --git a/scripts/[clientscript,script3166].cs2 b/scripts/[clientscript,script3166].cs2 new file mode 100644 index 000000000..6656a5c28 --- /dev/null +++ b/scripts/[clientscript,script3166].cs2 @@ -0,0 +1,28 @@ +// 3166 +[clientscript,script3166](component $component0, component $component1, component $component2, enum $enum3, int $int4) +if ($int4 = %varbit4146) { + return; +} +def_int $count5 = enum_getoutputcount($enum3); +def_int $count6 = 0; +def_int $comsubid7 = -1; +def_int $int8 = 0; +def_int $int9 = 0; +while ($count6 < $count5 & $comsubid7 = -1) { + if (cc_find($component1, $count6) = ^true & cc_gethide = false) { + $comsubid7 = $count6; + } + $count6 = calc($count6 + 1); +} +cc_deleteall($component0); +cc_deleteall($component1); +cc_deleteall($component2); +~script3165($component0, $component1, $component2, $comsubid7); +if (cc_find($component0, $comsubid7) = ^true) { + $int8 = cc_getx; + $int9 = cc_gety; + cc_create($component0, ^iftype_graphic, $count5); + cc_setgraphic("tick"); + cc_setsize(20, 20, ^setsize_abs, ^setsize_abs); + cc_setposition(calc($int8 + 50), calc($int9 + 50), ^setpos_abs_left, ^setpos_abs_top); +} diff --git a/scripts/[clientscript,script3167].cs2 b/scripts/[clientscript,script3167].cs2 new file mode 100644 index 000000000..b3b4ad522 --- /dev/null +++ b/scripts/[clientscript,script3167].cs2 @@ -0,0 +1,90 @@ +// 3167 +[clientscript,script3167](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8) +def_int $comsubid9 = ~steelborder($component1, "", 0); +~script5340($component1, $comsubid9); +if_setonvartransmit("script4686($component1, $comsubid9){var3172}", $component1); +if_setonclansettingstransmit("script4686($component1, $comsubid9)", $component1); +def_string $string0 = "Back"; +def_int $int10 = ~max(70, calc(parawidth($string0, 512, p12_full) + 20)); +if_setsize($int10, if_getheight($component2), ^setsize_abs, ^setsize_abs, $component2); +~clan_stonebutton_init($string0, $component2, "p12_full"); +if_setonop("opsound(event_opindex, 2)", $component2); +$int10 = calc($int10 + 20); +def_enum $enum11 = null; +def_struct $struct12 = null; +def_int $count13 = enum_getoutputcount(enum_4223); +def_int $int14 = 0; +def_int $count15 = 0; +while ($count15 < $count13) { + $enum11 = enum(int, enum, enum_4223, $count15); + if ($enum11 ! null) { + $struct12 = enum(int, struct, $enum11, -1); + if ($struct12 ! null) { + if (struct_param($struct12, param_1549) = true) { + $string0 = struct_param($struct12, param_1550); + } else { + $string0 = struct_param($struct12, param_1163); + } + $int10 = ~max($int10, calc(parawidth($string0, 512, p12_full) + 22 + 6)); + } + $int14 = calc($int14 + enum_getoutputcount($enum11) - 1); + } + $count15 = calc($count15 + 1); +} +if_setsize($int10, 0, ^setsize_abs, ^setsize_minus, $component3); +if_setsize(calc($int10 - 1), 0, ^setsize_minus, ^setsize_minus, $component6); +def_int $int16 = 100; +$int16 = calc(6 + 13 + 3 + $int16 + 3 + 13 + 6); +cc_deleteall($component4); +def_int $int17 = 0; +def_int $int18 = 20; +if (~on_mobile = true) { + $int18 = scale(5, 3, $int18); +} +cc_deleteall($component7); +def_int $int19 = 0; +while ($int19 <= $int14) { + cc_create($component7, ^iftype_graphic, $int19); + cc_setgraphic("tradebacking"); + cc_settiling(true); + $int19 = calc($int19 + 1); +} +$int10 = calc(if_getwidth(if_getlayer($component3)) - ($int10 - 1 + 4 + 16)); +def_int $int20 = calc(($int10 - 8 * 3) / 2); +def_int $int21 = calc(8 + $int20 + 8); +def_int $int22 = 6; +def_int $int23 = 0; +def_int $int24 = 0; +def_int $int25 = 0; +$count15, $int14 = 0, 0; +while ($count15 < $count13) { + $enum11 = enum(int, enum, enum_4223, $count15); + if ($enum11 ! null) { + $struct12 = enum(int, struct, $enum11, -1); + if ($struct12 ! null) { + $int19, $int17 = ~script3696($int19, $int22, struct_param($struct12, param_1163), $component7, $component4, $int17, $component8, $count15, $int18, struct_param($struct12, param_1549), struct_param($struct12, param_1550)); + $int22 = calc($int22 + 25 + 6); + } + $int24, $int25 = 0, calc(enum_getoutputcount($enum11) - 1); + while ($int24 < $int25) { + $struct12 = enum(int, struct, $enum11, $int24); + if ($struct12 ! null) { + if (calc($int24 % 2) = 1) { + $int19, $int23 = ~script4679($int19, $int21, $int22, $int20, $int16, $int14, $struct12, enum(int, struct, $enum11, calc($int24 - 1)), $component7); + $int22 = calc($int22 + $int23 + 6); + } else if ($int24 < calc($int25 - 1)) { + $int19, $int23 = ~script4679($int19, 8, $int22, $int20, $int16, $int14, $struct12, enum(int, struct, $enum11, calc($int24 + 1)), $component7); + } else { + $int19, $int23 = ~script4679($int19, 8, $int22, $int20, $int16, $int14, $struct12, null, $component7); + $int22 = calc($int22 + $int23 + 6); + } + $int14 = calc($int14 + 1); + } + $int24 = calc($int24 + 1); + } + } + $count15 = calc($count15 + 1); +} +~scrollbar_vertical($component8, $component7, "scrollbar_dragger_v2,3", "scrollbar_dragger_v2,0", "scrollbar_dragger_v2,1", "scrollbar_dragger_v2,2", "scrollbar_v2,0", "scrollbar_v2,1"); +~scrollbar_vertical($component5, $component4, "scrollbar_dragger_v2,3", "scrollbar_dragger_v2,0", "scrollbar_dragger_v2,1", "scrollbar_dragger_v2,2", "scrollbar_v2,0", "scrollbar_v2,1"); +~script3168($int22, $component7, $component8, calc($int18 * $count13), $component4, $component5, $component0, if_getheight(if_getlayer($component0))); diff --git a/scripts/[clientscript,script3199].cs2 b/scripts/[clientscript,script3199].cs2 new file mode 100644 index 000000000..67b7b16c0 --- /dev/null +++ b/scripts/[clientscript,script3199].cs2 @@ -0,0 +1,6 @@ +// 3199 +[clientscript,script3199](int $int0, component $component1, component $component2, int $int3, component $component4, component $component5, component $component6, int $height7) +def_int $height8 = if_getheight(if_getlayer($component6)); +if ($height8 ! $height7) { + ~script3168($int0, $component1, $component2, $int3, $component4, $component5, $component6, $height8); +} diff --git a/scripts/[clientscript,script4664].cs2 b/scripts/[clientscript,script4664].cs2 new file mode 100644 index 000000000..3a2c113ab --- /dev/null +++ b/scripts/[clientscript,script4664].cs2 @@ -0,0 +1,8 @@ +// 4664 +[clientscript,script4664](component $component0, component $component1, int $comsubid2, int $int3, int $int4, int $int5) +if (cc_find($component0, $comsubid2) = ^true) { + sound_synth(interface_select1, 1, 0); + cc_setcolour(^red); + cc_setontimer("script4673(event_com, event_comsubid, $int4, $int5, clientclock)"); + ~scrollbar_resize($component1, $component0, ~min(calc(if_getscrollheight($component0) - if_getheight($component0)), ~max(0, $int3))); +} diff --git a/scripts/[clientscript,script4673].cs2 b/scripts/[clientscript,script4673].cs2 new file mode 100644 index 000000000..0357d4712 --- /dev/null +++ b/scripts/[clientscript,script4673].cs2 @@ -0,0 +1,12 @@ +// 4673 +[clientscript,script4673](component $component0, int $comsubid1, int $int2, int $int3, int $clock4) +def_int $int5 = 0; +if (cc_find($component0, $comsubid1) = ^true) { + $int5 = calc(clientclock - $clock4); + if ($int5 >= 75) { + cc_setontimer(null); + cc_setcolour($int3); + } else { + cc_setcolour(~scale_colour($int2, $int3, $int5, 75)); + } +} diff --git a/scripts/[clientscript,script4680].cs2 b/scripts/[clientscript,script4680].cs2 new file mode 100644 index 000000000..a968fce5a --- /dev/null +++ b/scripts/[clientscript,script4680].cs2 @@ -0,0 +1,5 @@ +// 4680 +[clientscript,script4680](component $component0, int $comsubid1, int $int2, int $comsubid3, int $comsubid4, int $int5, struct $struct6) +if (.cc_find($component0, $comsubid1) = ^true) { + ~script4681($component0, $int2, $comsubid3, $comsubid4, $int5, $struct6); +} diff --git a/scripts/[clientscript,script4682].cs2 b/scripts/[clientscript,script4682].cs2 new file mode 100644 index 000000000..d76bfa0c7 --- /dev/null +++ b/scripts/[clientscript,script4682].cs2 @@ -0,0 +1,11 @@ +// 4682 +[clientscript,script4682](boolean $boolean0, component $component1, int $comsubid2, int $int3, int $int4, int $int5) +if (cc_find($component1, $comsubid2) = ^true & .cc_find($component1, $int3) = ^true) { + if ($boolean0 = true) { + .cc_settrans($int5); + cc_setontimer("script4685(calc(clientclock + 3), event_com, event_comsubid, $int3, $int4, $int5)"); + } else { + .cc_settrans($int4); + cc_setontimer(null); + } +} diff --git a/scripts/[clientscript,script4683].cs2 b/scripts/[clientscript,script4683].cs2 new file mode 100644 index 000000000..5e05d49a7 --- /dev/null +++ b/scripts/[clientscript,script4683].cs2 @@ -0,0 +1,12 @@ +// 4683 +[clientscript,script4683](int $opindex0, component $component1, int $comsubid2, int $int3, int $trans4, int $int5, int $int6) +if ($opindex0 ! 1) { + return; +} +sound_synth(interface_select1, 1, 0); +if (cc_find($component1, $comsubid2) = ^true & .cc_find($component1, $int3) = ^true) { + .cc_settrans($trans4); + cc_setontimer("script4685(calc(clientclock + 20), event_com, event_comsubid, $int3, $int5, $int6)"); + cc_setonmouserepeat(null); + cc_setonmouseleave(null); +} diff --git a/scripts/[clientscript,script4685].cs2 b/scripts/[clientscript,script4685].cs2 new file mode 100644 index 000000000..f99446128 --- /dev/null +++ b/scripts/[clientscript,script4685].cs2 @@ -0,0 +1,13 @@ +// 4685 +[clientscript,script4685](int $clock0, component $component1, int $comsubid2, int $int3, int $int4, int $int5) +if (clientclock < $clock0) { + return; +} +if (cc_find($component1, $comsubid2) = ^true & .cc_find($component1, $int3) = ^true) { + .cc_settrans($int4); + cc_setontimer(null); + if (~on_mobile = false) { + cc_setonmouserepeat("script4682(true, event_com, event_comsubid, $int3, $int4, $int5)"); + } + cc_setonmouseleave("script4682(false, event_com, event_comsubid, $int3, $int4, $int5)"); +} diff --git a/scripts/[clientscript,script4686].cs2 b/scripts/[clientscript,script4686].cs2 new file mode 100644 index 000000000..480e9d45f --- /dev/null +++ b/scripts/[clientscript,script4686].cs2 @@ -0,0 +1,3 @@ +// 4686 +[clientscript,script4686](component $component0, int $comsubid1) +~script5340($component0, $comsubid1); diff --git a/scripts/[proc,clan_permission_get].cs2 b/scripts/[proc,clan_permission_get].cs2 index 5a461bae0..3da38ccfc 100644 --- a/scripts/[proc,clan_permission_get].cs2 +++ b/scripts/[proc,clan_permission_get].cs2 @@ -32,14 +32,28 @@ switch_struct ($struct0) { $int1 = %varclansetting24; case joining_leaving_clan_3106 : $int1 = %varclansetting27; - case quest_broadcasts_3107 : + case quest_broadcasts_4230 : $int1 = %varclansetting28; - case loot_broadcasts_3108 : + case loot_broadcasts_4243 : $int1 = %varclansetting29; - case level_up_broadcasts_3110 : + case level_up_broadcasts_4236 : $int1 = %varclansetting30; - case combat_achievement_broadcasts_3599 : + case combat_achievement_broadcasts_4244 : $int1 = %varclansetting32; + case collection_log_broadcasts_4231 : + $int1 = %varclansetting58; + case personal_best_broadcasts_4232 : + $int1 = %varclansetting59; + case pk_broadcasts_4246 : + $int1 = %varclansetting60; + case player_defeat_broadcasts_4248 : + $int1 = %varclansetting61; + case achievement_diary_broadcasts_4233 : + $int1 = %varclansetting62; + case hardcore_death_broadcasts_4234 : + $int1 = %varclansetting63; + case post_99_xp_broadcasts_4237 : + $int1 = %varclansetting64; case talk_in_chat_2954 : $int1 = calc(activeclansettings_getranktalk + 2); case kick_from_chat_2955 : diff --git a/scripts/[proc,clan_permissions_buttonresynch].cs2 b/scripts/[proc,clan_permissions_buttonresynch].cs2 index 7ba1cf5aa..cb7d6ec37 100644 --- a/scripts/[proc,clan_permissions_buttonresynch].cs2 +++ b/scripts/[proc,clan_permissions_buttonresynch].cs2 @@ -62,7 +62,7 @@ if (%varbit12165 = 1 & %varbit12164 = 3 & activeclansettings_find_listened = tru $text0 = "N/A"; } case loot_broadcast_value_3109 : - if (~clan_permission_get(loot_broadcasts_3108) ! 128) { + if (~clan_permission_get(loot_broadcasts_4243) ! 128) { if (%varclansetting31 > 1) { $text0 = "<~tostring_spacer(%varclansetting31, ",")> coins"; } else if (%varclansetting31 = 1) { @@ -73,6 +73,58 @@ if (%varbit12165 = 1 & %varbit12164 = 3 & activeclansettings_find_listened = tru } else { $text0 = "N/A"; } + case pk_broadcast_value_4247 : + if (~clan_permission_get(pk_broadcasts_4246) ! 128) { + if (%varclansetting65 > 1) { + $text0 = "<~tostring_spacer(%varclansetting65, ",")> coins"; + } else if (%varclansetting65 = 1) { + $text0 = "1 coin"; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case level_up_increments_of_10_4239 : + if (~clan_permission_get(level_up_broadcasts_4236) ! 128) { + if (%varclansetting66 > 0) { + $text0 = "Level "; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case level_up_increments_of_5_4240 : + if (~clan_permission_get(level_up_broadcasts_4236) ! 128) { + if (%varclansetting67 > 0) { + $text0 = "Level "; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case level_up_increments_of_1_4241 : + if (~clan_permission_get(level_up_broadcasts_4236) ! 128) { + if (%varclansetting68 > 0) { + $text0 = "Level "; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case post_99_xp_broadcast_intervals_4238 : + if (~clan_permission_get(post_99_xp_broadcasts_4237) ! 128) { + if (%varclansetting69 > 0) { + $text0 = " million XP"; + } else { + $text0 = "No interval set"; + } + } else { + $text0 = "N/A"; + } } } else { $int6 = ~clan_permission_get($struct5); diff --git a/scripts/[proc,clan_permissions_categorytitle].cs2 b/scripts/[proc,clan_permissions_categorytitle].cs2 index ea1f3c4d1..aada46911 100644 --- a/scripts/[proc,clan_permissions_categorytitle].cs2 +++ b/scripts/[proc,clan_permissions_categorytitle].cs2 @@ -1,5 +1,5 @@ // 4460 -[proc,clan_permissions_categorytitle](int $int0, int $int1, string $op0, component $component2, component $component3, int $int4, component $component5, int $count6, int $int7)(int, int) +[proc,clan_permissions_categorytitle](int $int0, int $int1, string $op0, component $component2, component $component3, int $int4, component $component5, int $count6, int $int7, boolean $boolean8, string $text1)(int, int) cc_create($component2, ^iftype_graphic, $int0); $int0 = calc($int0 + 1); cc_setsize(0, 25, ^setsize_minus, ^setsize_abs); @@ -37,9 +37,21 @@ if (~on_mobile = false) { $int4 = calc($int4 + 1); .cc_setsize(0, $int7, ^setsize_minus, ^setsize_abs); .cc_setposition(0, calc($count6 * $int7), ^setpos_abs_centre, ^setpos_abs_top); -.cc_setcolour(0xff981f); +if ($boolean8 = true) { + .cc_setcolour(^white); +} else { + .cc_setcolour(0xff981f); +} .cc_settextshadow(true); -.cc_settextfont(p12_full); +if ($boolean8 = true) { + .cc_settextfont(p11_full); +} else { + .cc_settextfont(p12_full); +} .cc_settextalign(^settextalign_centre, ^settextalign_centre, 0); -.cc_settext($op0); +if ($boolean8 = true) { + .cc_settext($text1); +} else { + .cc_settext($op0); +} return($int0, $int4); diff --git a/scripts/[proc,gim_settings_draw].cs2 b/scripts/[proc,gim_settings_draw].cs2 index a5d313645..3a2aaccdd 100644 --- a/scripts/[proc,gim_settings_draw].cs2 +++ b/scripts/[proc,gim_settings_draw].cs2 @@ -1,5 +1,5 @@ // 5504 -[proc,gim_settings_draw](component $component0, int $comsubid1, component $component2, int $comsubid3, component $component4, component $component5, component $component6, component $component7, component $component8) +[proc,gim_settings_draw](component $component0, int $comsubid1, component $component2, int $comsubid3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9) if (%varbit12165 = 1 & %varbit12164 = 3 & activeclansettings_find_listened = true | %varbit12165 = 0 & %varbit13060 = 3 & activeclansettings_find_affined(^clantype_gim) = true) { if (cc_find($component2, $comsubid3) = ^true) { cc_sethide(true); @@ -13,16 +13,18 @@ if (%varbit12165 = 1 & %varbit12164 = 3 & activeclansettings_find_listened = tru if (%varbit12165 = 1) { ~clan_stonebutton_init("Hiscores", $component6, "p12_full"); ~clan_stonebutton_init("Group Storage", $component7, "p12_full"); - ~clan_stonebutton_init("Leave Group", $component8, "p12_full"); + ~clan_stonebutton_init("Options", $component8, "p12_full"); + ~clan_stonebutton_init("Leave Group", $component9, "p12_full"); } else { ~clan_stonebutton_init("Hiscores", $component6, "p12_full"); ~clan_stonebutton_init("Group Storage", $component7, "p12_full"); + ~clan_stonebutton_init("Options", $component8, "p12_full"); if (%varbit13126 = 1) { - ~clan_stonebutton_init("Cancel Leave", $component8, "p12_full"); + ~clan_stonebutton_init("Cancel Leave", $component9, "p12_full"); } else { - ~clan_stonebutton_init("Leave Group", $component8, "p12_full"); + ~clan_stonebutton_init("Leave Group", $component9, "p12_full"); } - if_setonvartransmit("script5505($component8){var3171}", $component8); + if_setonvartransmit("script5505($component9){var3171}", $component9); } return; } @@ -36,3 +38,4 @@ if_sethide(true, $component4); if_sethide(true, $component5); cc_deleteall($component6); cc_deleteall($component8); +cc_deleteall($component9); diff --git a/scripts/[proc,makeover_feet_add_option].cs2 b/scripts/[proc,makeover_feet_add_option].cs2 index 45baf5176..c2ee5d9af 100644 --- a/scripts/[proc,makeover_feet_add_option].cs2 +++ b/scripts/[proc,makeover_feet_add_option].cs2 @@ -1,13 +1,14 @@ // 3603 -[proc,makeover_feet_add_option](int $int0, int $comsubid1, int $y2, int $x3, component $component4, component $component5) -def_obj $obj6 = enum(int, obj, enum_3314, $int0); +[proc,makeover_feet_add_option](int $int0, int $comsubid1, int $y2, int $x3, component $component4, component $component5, enum $enum6, int $comsubid7) +def_obj $obj8 = enum(int, obj, $enum6, $int0); def_string $string0 = enum(int, string, enum_3315, $int0); +def_string $string1 = enum(int, string, enum_4222, calc(%varbit4146 % enum_getoutputcount(enum_4222))); cc_create($component4, ^iftype_model, $comsubid1); cc_setsize(80, 80, ^setsize_abs, ^setsize_abs); cc_setposition($x3, $y2, ^setpos_abs_left, ^setpos_abs_top); -cc_setobject($obj6, -1); -cc_setop(1, "Choose-<$string0>"); -cc_setonop("makeover_feet_select($int0, $component4, $component5)"); +cc_setobject($obj8, -1); +cc_setop(1, "Choose <$string1> <$string0>"); +cc_setonop("makeover_feet_select($int0, $component4, $component5, $enum6)"); cc_create($component5, ^iftype_text, $int0); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); @@ -17,7 +18,9 @@ cc_settextshadow(true); cc_settextalign(^settextalign_centre, ^settextalign_centre, 10); cc_settext("Confirm (500 Coins)"); cc_setop(1, "Confirm"); -cc_sethide(true); +if ($comsubid7 ! $comsubid1) { + cc_sethide(true); +} if (~on_mobile = false) { cc_setonmouserepeat("cc_colour_swapper($component5, cc_getid, 0xbebebe)"); cc_setonmouseleave("cc_colour_swapper($component5, cc_getid, 0x00d34c)"); diff --git a/scripts/[proc,panetest].cs2 b/scripts/[proc,panetest].cs2 index ab921a255..21844c573 100644 --- a/scripts/[proc,panetest].cs2 +++ b/scripts/[proc,panetest].cs2 @@ -12,7 +12,7 @@ switch_int (%varcint41) { return(1); } else if ($chattype0 = ^chattype_clanmessage & ~gim_notification_message($string1) = 1) { return(1); - } else if ($chattype0 = ^chattype_clanchat & ~script5501($string1) = 1) { + } else if ($chattype0 = ^chattype_clanchat & ~gim_notification_message($string1) = 1) { return(1); } case 2 : diff --git a/scripts/[proc,script3165].cs2 b/scripts/[proc,script3165].cs2 new file mode 100644 index 000000000..ba4f5d779 --- /dev/null +++ b/scripts/[proc,script3165].cs2 @@ -0,0 +1,43 @@ +// 3165 +[proc,script3165](component $component0, component $component1, component $component2, int $comsubid3) +def_enum $enum4 = enum(int, enum, enum_4217, %varbit4146); +def_int $count5 = enum_getoutputcount($enum4); +def_int $int6 = 0; +def_int $int7 = 0; +def_int $int8 = 10; +def_int $int9 = 60; +cc_create($component2, ^iftype_text, 0); +cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); +cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); +cc_setcolour(0x00d34c); +cc_settextfont(b12_full); +cc_settextshadow(true); +cc_settextalign(^settextalign_centre, ^settextalign_centre, 10); +cc_settext("Style: "); +cc_setonvartransmit("script3166($component0, $component1, $component2, $enum4, %varbit4146){var638}"); +cc_setop(1, "Switch-style "); +if (~on_mobile = false) { + cc_setonmouserepeat("cc_colour_swapper($component2, 0, 0xbebebe)"); + cc_setonmouseleave("cc_colour_swapper($component2, 0, 0x00d34c)"); +} +while ($int6 < $count5) { + ~makeover_feet_add_option($int6, $int7, $int8, $int9, $component0, $component1, $enum4, $comsubid3); + if ($int6 ! 0 & calc(($int6 + 1) % 3) = 0) { + $int9 = 60; + $int8 = calc($int8 + 100); + } else { + $int9 = calc($int9 + 120); + } + $int6 = calc($int6 + 1); + $int7 = calc($int7 + 1); +} +if ($comsubid3 = -1) { + cc_create($component1, ^iftype_text, $count5); + cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); + cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); + cc_setcolour(0xff981f); + cc_settextfont(b12_full); + cc_settextshadow(true); + cc_settextalign(^settextalign_centre, ^settextalign_centre, 10); + cc_settext("Select a new pair of shoes."); +} diff --git a/scripts/[proc,script3168].cs2 b/scripts/[proc,script3168].cs2 new file mode 100644 index 000000000..278ffef7d --- /dev/null +++ b/scripts/[proc,script3168].cs2 @@ -0,0 +1,25 @@ +// 3168 +[proc,script3168](int $int0, component $component1, component $component2, int $int3, component $component4, component $component5, component $component6, int $height7) +def_int $int8 = 54; +def_int $int9 = ~min(calc($height7 - 10), calc($int8 + $int0)); +if_setsize(if_getwidth($component6), $int9, ^setsize_abs, ^setsize_abs, $component6); +def_int $int10 = calc($int9 - $int8); +if ($int0 > $int10) { + if_setscrollsize(0, $int0, $component1); + ~scrollbar_resize($component2, $component1, ~min(calc($int0 - $int10), ~max(0, %varcint63))); +} else { + if_setscrollpos(0, 0, $component1); + if_setscrollsize(0, 0, $component1); + ~scrollbar_resize($component2, $component1, 0); +} +$int8 = calc($int8 + 45); +$int10 = calc($int9 - $int8); +if ($int3 > $int10) { + if_setscrollsize(0, $int3, $component4); + ~scrollbar_resize($component5, $component4, ~min(calc($int3 - $int10), ~max(0, %varcint49))); +} else { + if_setscrollpos(0, 0, $component4); + if_setscrollsize(0, 0, $component4); + ~scrollbar_resize($component5, $component4, 0); +} +if_setontimer("script3199($int0, $component1, $component2, $int3, $component4, $component5, $component6, $height7)", if_getlayer($component6)); diff --git a/scripts/[proc,script3696].cs2 b/scripts/[proc,script3696].cs2 new file mode 100644 index 000000000..17a8db799 --- /dev/null +++ b/scripts/[proc,script3696].cs2 @@ -0,0 +1,57 @@ +// 3696 +[proc,script3696](int $int0, int $int1, string $op0, component $component2, component $component3, int $int4, component $component5, int $count6, int $int7, boolean $boolean8, string $text1)(int, int) +cc_create($component2, ^iftype_graphic, $int0); +$int0 = calc($int0 + 1); +cc_setsize(0, 25, ^setsize_minus, ^setsize_abs); +cc_setposition(0, $int1, ^setpos_abs_centre, ^setpos_abs_top); +cc_setgraphic("tradebacking"); +cc_settiling(true); +cc_create($component2, ^iftype_text, $int0); +$int0 = calc($int0 + 1); +cc_setsize(0, 25, ^setsize_minus, ^setsize_abs); +cc_setposition(0, $int1, ^setpos_abs_centre, ^setpos_abs_top); +cc_setcolour(0xff981f); +cc_settextshadow(true); +cc_settextfont(b12_full); +cc_settextalign(^settextalign_centre, ^settextalign_centre, 0); +cc_settext($op0); +.cc_create($component3, ^iftype_rectangle, $int4); +$int4 = calc($int4 + 1); +.cc_setsize(0, $int7, ^setsize_minus, ^setsize_abs); +.cc_setposition(0, calc($count6 * $int7), ^setpos_abs_centre, ^setpos_abs_top); +.cc_setcolour(^white); +.cc_setfill(true); +if (calc($count6 % 2) = 0) { + .cc_settrans(230); + .cc_setonmouseleave("cc_settrans(event_com, event_comsubid, 230, null)"); +} else { + .cc_settrans(215); + .cc_setonmouseleave("cc_settrans(event_com, event_comsubid, 215, null)"); +} +if (~on_mobile = false) { + .cc_setonmouserepeat("cc_settrans(event_com, event_comsubid, 200, null)"); +} +.cc_setop(1, $op0); +.cc_setonop("script4664($component2, $component5, cc_getid, $int1, 16711680, 16750623)"); +.cc_create($component3, ^iftype_text, $int4); +$int4 = calc($int4 + 1); +.cc_setsize(0, $int7, ^setsize_minus, ^setsize_abs); +.cc_setposition(0, calc($count6 * $int7), ^setpos_abs_centre, ^setpos_abs_top); +if ($boolean8 = true) { + .cc_setcolour(^white); +} else { + .cc_setcolour(0xff981f); +} +.cc_settextshadow(true); +if ($boolean8 = true) { + .cc_settextfont(p11_full); +} else { + .cc_settextfont(p12_full); +} +.cc_settextalign(^settextalign_centre, ^settextalign_centre, 0); +if ($boolean8 = true) { + .cc_settext($text1); +} else { + .cc_settext($op0); +} +return($int0, $int4); diff --git a/scripts/[proc,script4679].cs2 b/scripts/[proc,script4679].cs2 new file mode 100644 index 000000000..c47fa0dd7 --- /dev/null +++ b/scripts/[proc,script4679].cs2 @@ -0,0 +1,83 @@ +// 4679 +[proc,script4679](int $int0, int $int1, int $int2, int $int3, int $int4, int $comsubid5, struct $struct6, struct $struct7, component $component8)(int, int) +def_int $width9 = calc($int3 - 6 * 2); +def_string $string0 = struct_param($struct6, param_1163); +def_int $int10 = calc(paraheight($string0, $width9, p12_full) * 12 + 5); +def_string $string1 = struct_param($struct6, param_1536); +def_int $int11 = calc(paraheight($string1, $width9, p12_full) * 12 + 5); +if ($struct7 ! null) { + $int10 = ~max($int10, calc(paraheight(struct_param($struct7, param_1163), $width9, p12_full) * 12 + 5)); + $int11 = ~max($int11, calc(paraheight(struct_param($struct7, param_1536), $width9, p12_full) * 12 + 5)); +} +def_int $int12 = calc(6 + $int10 + 3 + 21 + 3 + $int11 + 6); +def_int $int13 = -1; +def_int $comsubid14 = -1; +def_int $comsubid15 = -1; +def_int $int16 = -1; +if (.cc_find($component8, $comsubid5) = ^true) { + .cc_setsize($int3, $int12, ^setsize_abs, ^setsize_abs); + .cc_setposition($int1, $int2, ^setpos_abs_left, ^setpos_abs_top); + .cc_setop(1, removetags(~string_findandreplace($string0, "
", " "))); + cc_create($component8, ^iftype_rectangle, $int0); + $int13 = $int0; + $int0 = calc($int0 + 1); + cc_setsize($int3, $int12, ^setsize_abs, ^setsize_abs); + cc_setposition($int1, $int2, ^setpos_abs_left, ^setpos_abs_top); + cc_setcolour(^white); + cc_setfill(true); + $int0 = ~stoneborder_free($component8, $int0, $int3, $int12, $int1, $int2); + cc_create($component8, ^iftype_text, $int0); + $int0 = calc($int0 + 1); + cc_setsize($width9, $int10, ^setsize_abs, ^setsize_abs); + cc_setposition(calc($int1 + 6), calc($int2 + 6), ^setpos_abs_left, ^setpos_abs_top); + cc_setcolour(0xff981f); + cc_settextshadow(true); + cc_settextfont(p12_full); + cc_settextalign(^settextalign_centre, ^settextalign_centre, 0); + cc_settext($string0); + cc_create($component8, ^iftype_text, $int0); + $int0 = calc($int0 + 1); + cc_setsize($width9, $int11, ^setsize_abs, ^setsize_abs); + cc_setposition(calc($int1 + 6), calc($int2 + 6 + $int10 + 3 + 21 + 3), ^setpos_abs_left, ^setpos_abs_top); + cc_setcolour(0xbfbfbf); + cc_settextshadow(true); + cc_settextfont(p12_full); + cc_settextalign(^settextalign_left, ^settextalign_top, 0); + cc_settext($string1); + cc_create($component8, ^iftype_rectangle, $int0); + $int0 = calc($int0 + 1); + cc_setsize($int4, 21, ^setsize_abs, ^setsize_abs); + cc_setposition(calc($int1 + ($int3 - $int4) / 2), calc($int2 + 6 + $int10 + 3), ^setpos_abs_left, ^setpos_abs_top); + cc_setcolour(0x0e0e0c); + cc_setfill(true); + cc_create($component8, ^iftype_rectangle, $int0); + $int0 = calc($int0 + 1); + cc_setsize(calc($int4 - 2), 19, ^setsize_abs, ^setsize_abs); + cc_setposition(calc($int1 + ($int3 - $int4) / 2 + 1), calc($int2 + 6 + $int10 + 3 + 1), ^setpos_abs_left, ^setpos_abs_top); + cc_setcolour(0x474745); + cc_setfill(true); + cc_create($component8, ^iftype_graphic, $int0); + $comsubid14 = $int0; + $int0 = calc($int0 + 1); + cc_setsize(calc($int4 - 4), 17, ^setsize_abs, ^setsize_abs); + cc_setposition(calc($int1 + ($int3 - $int4) / 2 + 2), calc($int2 + 6 + $int10 + 3 + 2), ^setpos_abs_left, ^setpos_abs_top); + cc_settiling(true); + cc_create($component8, ^iftype_text, $int0); + $comsubid15 = $int0; + $int0 = calc($int0 + 1); + cc_setsize(calc($int4 - 4), 17, ^setsize_abs, ^setsize_abs); + cc_setposition(calc($int1 + ($int3 - $int4) / 2 + 2), calc($int2 + 6 + $int10 + 3 + 2), ^setpos_abs_left, ^setpos_abs_top); + cc_setcolour(^white); + cc_settextshadow(true); + cc_settextfont(p12_full); + cc_settextalign(^settextalign_centre, ^settextalign_centre, 0); + cc_create($component8, ^iftype_graphic, $int0); + $int16 = $int0; + $int0 = calc($int0 + 1); + cc_setsize(13, 13, ^setsize_abs, ^setsize_abs); + cc_setposition(calc($int1 + ($int3 - $int4) / 2 + 6), calc($int2 + 6 + $int10 + 3 + (21 - 13) / 2), ^setpos_abs_left, ^setpos_abs_top); + ~script4681($component8, $int13, $comsubid14, $comsubid15, $int16, $struct6); + .cc_setonvartransmit("script4680(event_com, event_comsubid, $int13, $comsubid14, $comsubid15, $int16, $struct6){var3172}"); + .cc_setonclansettingstransmit("script4680(event_com, event_comsubid, $int13, $comsubid14, $comsubid15, $int16, $struct6)"); +} +return($int0, $int12); diff --git a/scripts/[proc,script4681].cs2 b/scripts/[proc,script4681].cs2 new file mode 100644 index 000000000..4f83f2f06 --- /dev/null +++ b/scripts/[proc,script4681].cs2 @@ -0,0 +1,116 @@ +// 4681 +[proc,script4681](component $component0, int $int1, int $comsubid2, int $comsubid3, int $int4, struct $struct5) +def_int $int6 = 0; +def_int $int7 = -1; +def_int $int8 = 0; +def_string $text0 = "..."; +def_int $int9 = 0; +if (%varbit12165 = 1 & %varbit12164 = 3 & activeclansettings_find_listened = true | %varbit12165 = 0 & %varbit13060 = 3 & activeclansettings_find_affined(^clantype_gim) = true) { + $int7 = activeclansettings_getaffinedslot(removetags(chat_playername)); + if (struct_param($struct5, param_1537) = true) { + switch_struct ($struct5) { + case struct_4223 : + if (~script5341(struct_4222) = 1) { + if (%varclansetting52 > 1) { + $text0 = "<~tostring_spacer(%varclansetting52, ",")> coins"; + } else if (%varclansetting52 = 1) { + $text0 = "1 coin"; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case struct_4227 : + if (~script5341(struct_4226) = 1) { + if (%varclansetting53 > 1) { + $text0 = "<~tostring_spacer(%varclansetting53, ",")> coins"; + } else if (%varclansetting53 = 1) { + $text0 = "1 coin"; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case struct_4216 : + if (~script5341(struct_4215) = 1) { + if (%varclansetting54 > 0) { + $text0 = "Level "; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case struct_4217 : + if (~script5341(struct_4215) = 1) { + if (%varclansetting55 > 0) { + $text0 = "Level "; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case struct_4218 : + if (~script5341(struct_4215) = 1) { + if (%varclansetting56 > 0) { + $text0 = "Level "; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + case struct_4220 : + if (~script5341(struct_4219) = 1) { + if (%varclansetting57 > 0) { + $text0 = " million XP"; + } else { + $text0 = "No minimum"; + } + } else { + $text0 = "N/A"; + } + } + } else if (~script5341($struct5) = 1) { + $text0 = "Enabled"; + } else { + $text0 = "Disabled"; + } + if ($int7 ! -1) { + $int9 = 1; + } + if (cc_find($component0, $comsubid3) = ^true) { + cc_settext($text0); + } + if ($int9 = 1) { + if (cc_find($component0, $comsubid2) = ^true) { + cc_setgraphic("tradebacking"); + } + if (cc_find($component0, $int1) = ^true) { + cc_settrans(245); + } + if (~on_mobile = false) { + .cc_setonmouserepeat("script4682(true, event_com, event_comsubid, $int1, 245, 225)"); + } + .cc_setonmouseleave("script4682(false, event_com, event_comsubid, $int1, 245, 225)"); + .cc_setontimer(null); + .cc_setonop("script4683(event_opindex, event_com, event_comsubid, $int1, 200, 245, 225)"); + return; + } +} +if (cc_find($component0, $comsubid3) = ^true) { + cc_settext($text0); +} +if (cc_find($component0, $comsubid2) = ^true) { + cc_setgraphic("tradebacking_dark"); +} +if (cc_find($component0, $int1) = ^true) { + cc_settrans(255); +} +.cc_setonmouserepeat(null); +.cc_setonmouseleave(null); +.cc_setontimer(null); +.cc_setonop(null); diff --git a/scripts/[proc,script5340].cs2 b/scripts/[proc,script5340].cs2 new file mode 100644 index 000000000..0c5b8499c --- /dev/null +++ b/scripts/[proc,script5340].cs2 @@ -0,0 +1,9 @@ +// 5340 +[proc,script5340](component $component0, int $comsubid1) +if (%varbit12165 = 1 & %varbit12164 = 3 & activeclansettings_find_listened = true | %varbit12165 = 0 & %varbit13060 = 3 & activeclansettings_find_affined(^clantype_gim) = true) { + if (cc_find($component0, $comsubid1) = ^true) { + cc_settext(": Options"); + } +} else if (cc_find($component0, $comsubid1) = ^true) { + cc_settext(~script4287); +} diff --git a/scripts/[proc,script5341].cs2 b/scripts/[proc,script5341].cs2 new file mode 100644 index 000000000..bd3462a4a --- /dev/null +++ b/scripts/[proc,script5341].cs2 @@ -0,0 +1,26 @@ +// 5341 +[proc,script5341](struct $struct0)(int) +switch_struct ($struct0) { + case struct_4210 : + return(testbit(%varclansetting51, 0)); + case struct_4213 : + return(testbit(%varclansetting51, 1)); + case struct_4211 : + return(testbit(%varclansetting51, 2)); + case struct_4212 : + return(testbit(%varclansetting51, 3)); + case struct_4215 : + return(testbit(%varclansetting51, 4)); + case struct_4219 : + return(testbit(%varclansetting51, 5)); + case struct_4222 : + return(testbit(%varclansetting51, 6)); + case struct_4224 : + return(testbit(%varclansetting51, 7)); + case struct_4226 : + return(testbit(%varclansetting51, 8)); + case struct_4228 : + return(testbit(%varclansetting51, 9)); + case default : + return(0); +} diff --git a/scripts/[proc,scrollbar_vertical_doscroll].cs2 b/scripts/[proc,scrollbar_vertical_doscroll].cs2 index 72cf9319e..2823b3d49 100644 --- a/scripts/[proc,scrollbar_vertical_doscroll].cs2 +++ b/scripts/[proc,scrollbar_vertical_doscroll].cs2 @@ -22,10 +22,12 @@ switch_component ($component1) { %varcint69 = if_getscrolly($component1); case interface_675:4, interface_458:3 : %varcint58 = if_getscrolly($component1); - case poll_results:11, interface_400:10, interface_690:10, interface_706:12, interface_700:20, interface_695:11, interface_731:12 : + case poll_results:11, interface_400:10, interface_690:10, interface_706:12, interface_700:20, interface_695:11, interface_731:12, interface_744:12 : %varcint63 = if_getscrolly($component1); case interface_706:8 : %varcint49 = if_getscrolly($component1); + case interface_744:8 : + %varcint49 = if_getscrolly($component1); case interface_92:4 : %varcint203 = if_getscrolly($component1); case interface_179:5 : diff --git a/scripts/[proc,settings_input_setting_set_transmit].cs2 b/scripts/[proc,settings_input_setting_set_transmit].cs2 index 09c17a5de..6cfbe9bbc 100644 --- a/scripts/[proc,settings_input_setting_set_transmit].cs2 +++ b/scripts/[proc,settings_input_setting_set_transmit].cs2 @@ -7,6 +7,4 @@ switch_int ($int1) { cc_setonvartransmit("settings_input_setting_transmit($struct0, $int1, $comsubid2, $comsubid3, $comsubid4, $component5, $comsubid6){var284, var2855}"); case 66 : cc_setonvartransmit("settings_input_setting_transmit($struct0, $int1, $comsubid2, $comsubid3, $comsubid4, $component5, $comsubid6){var1348, var2855}"); - case 200 : - cc_setonvartransmit("settings_input_setting_transmit($struct0, $int1, $comsubid2, $comsubid3, $comsubid4, $component5, $comsubid6){var3189}"); } diff --git a/scripts/[proc,settings_toggle_choose_transmit].cs2 b/scripts/[proc,settings_toggle_choose_transmit].cs2 index 73d63ddd6..9a724a7a0 100644 --- a/scripts/[proc,settings_toggle_choose_transmit].cs2 +++ b/scripts/[proc,settings_toggle_choose_transmit].cs2 @@ -41,10 +41,6 @@ switch_int ($int3) { cc_setonvartransmit("settings_toggle_transmit($component0, $int1, $boolean2, $int3, $trans5, $struct4){var3074}"); case 192 : cc_setonvartransmit("settings_toggle_transmit($component0, $int1, $boolean2, $int3, $trans5, $struct4){var2675}"); - case 201, 202 : - cc_setonvartransmit("settings_toggle_transmit($component0, $int1, $boolean2, $int3, $trans5, $struct4){var3189}"); - case 203, 204 : - cc_setonvartransmit("settings_toggle_transmit($component0, $int1, $boolean2, $int3, $trans5, $struct4){var3190}"); case 210 : cc_setonvartransmit("settings_toggle_transmit($component0, $int1, $boolean2, $int3, $trans5, $struct4){var3154}"); case 206 :