Skip to content

Commit 264b4a0

Browse files
committed
186.1
1 parent 0a9ffd1 commit 264b4a0

File tree

65 files changed

+1058
-308
lines changed

Some content is hidden

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

65 files changed

+1058
-308
lines changed

README.md

+32-1
Original file line numberDiff line numberDiff line change
@@ -3205,7 +3205,7 @@
32053205
[**3202**](scripts/[clientscript,league_tasks_init].cs2) `[clientscript,league_tasks_init]`
32063206
[**3203**](scripts/[clientscript,league_tasks_draw_list].cs2) `[clientscript,league_tasks_draw_list]`
32073207
[**3204**](scripts/[proc,league_tasks_draw_list].cs2) `[proc,league_tasks_draw_list]`
3208-
[**3205**](scripts/script3205.cs2)
3208+
[**3205**](scripts/[proc,account_setup_tabs].cs2) `[proc,account_setup_tabs]`
32093209
[**3206**](scripts/[clientscript,league_task_hover].cs2) `[clientscript,league_task_hover]`
32103210
[**3207**](scripts/[clientscript,league_task_filter_init].cs2) `[clientscript,league_task_filter_init]`
32113211
[**3208**](scripts/[clientscript,league_task_updatetext].cs2) `[clientscript,league_task_updatetext]`
@@ -3240,3 +3240,34 @@
32403240
[**3237**](scripts/[proc,questlist_members_progress_grey].cs2) `[proc,questlist_members_progress_grey]`
32413241
[**3238**](scripts/script3238.cs2)
32423242
[**3239**](scripts/[proc,questlist_showprogress_grey].cs2) `[proc,questlist_showprogress_grey]`
3243+
[**3240**](scripts/script3240.cs2)
3244+
[**3241**](scripts/script3241.cs2)
3245+
[**3242**](scripts/script3242.cs2)
3246+
[**3243**](scripts/script3243.cs2)
3247+
[**3244**](scripts/script3244.cs2)
3248+
[**3245**](scripts/script3245.cs2)
3249+
[**3246**](scripts/script3246.cs2)
3250+
[**3247**](scripts/script3247.cs2)
3251+
[**3248**](scripts/script3248.cs2)
3252+
[**3249**](scripts/script3249.cs2)
3253+
[**3250**](scripts/script3250.cs2)
3254+
[**3251**](scripts/script3251.cs2)
3255+
[**3252**](scripts/script3252.cs2)
3256+
[**3253**](scripts/[clientscript,magic_training_init].cs2) `[clientscript,magic_training_init]`
3257+
[**3254**](scripts/[clientscript,magic_training_rewards].cs2) `[clientscript,magic_training_rewards]`
3258+
[**3255**](scripts/[proc,magic_training_rewards].cs2) `[proc,magic_training_rewards]`
3259+
[**3256**](scripts/[clientscript,magic_training_rewards_op].cs2) `[clientscript,magic_training_rewards_op]`
3260+
[**3257**](scripts/[proc,magic_training_highlight_selected].cs2) `[proc,magic_training_highlight_selected]`
3261+
[**3258**](scripts/[proc,magic_training_costs_background].cs2) `[proc,magic_training_costs_background]`
3262+
[**3259**](scripts/[clientscript,magic_training_costs_transmit].cs2) `[clientscript,magic_training_costs_transmit]`
3263+
[**3260**](scripts/[proc,magic_training_costs].cs2) `[proc,magic_training_costs]`
3264+
[**3261**](scripts/[clientscript,magic_training_confirm_transmit].cs2) `[clientscript,magic_training_confirm_transmit]`
3265+
[**3262**](scripts/[proc,magic_training_confirm].cs2) `[proc,magic_training_confirm]`
3266+
[**3263**](scripts/[clientscript,account_tab_highlight].cs2) `[clientscript,account_tab_highlight]`
3267+
[**3264**](scripts/[clientscript,account_tab_highlight_reset].cs2) `[clientscript,account_tab_highlight_reset]`
3268+
[**3265**](scripts/[proc,account_tab_highlight].cs2) `[proc,account_tab_highlight]`
3269+
[**3266**](scripts/[proc,account_tab_highlight_reset].cs2) `[proc,account_tab_highlight_reset]`
3270+
[**3267**](scripts/[clientscript,account_switch_tab].cs2) `[clientscript,account_switch_tab]`
3271+
[**3268**](scripts/[clientscript,account_update_tabs].cs2) `[clientscript,account_update_tabs]`
3272+
[**3269**](scripts/[proc,account_update_tabs].cs2) `[proc,account_update_tabs]`
3273+
[**3270**](scripts/[proc,account_polls_update].cs2) `[proc,account_polls_update]`
+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
// 2497
2-
[clientscript,account_init](component $component0)
3-
if_setonvartransmit("account_update_display{var1780, var1781, var1795, var1737}", $component0);
2+
[clientscript,account_init](component $component0, component $component1)
3+
if_setonvartransmit("account_update_display{var1780, var1781, var1795, var1737, var375}", $component0);
4+
~account_setup_tabs;
5+
if_setonvartransmit("account_update_tabs{var1666}", $component1);
6+
~account_update_tabs(%varbit10060);
47
~account_update_display;
58
~script2833;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// 3267
2+
[clientscript,account_switch_tab](int $int0)
3+
%varbit10060 = $int0;
4+
~account_update_tabs(%varbit10060);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// 3263
2+
[clientscript,account_tab_highlight](component $component0, component $component1, component $component2, int $int3)
3+
if (%varbit10060 = $int3) {
4+
~account_tab_highlight_reset($component0, $component1, $component2, $int3);
5+
} else {
6+
~account_tab_highlight($component0, $component1, $component2, $int3);
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 3264
2+
[clientscript,account_tab_highlight_reset](component $component0, component $component1, component $component2, int $int3)
3+
~account_tab_highlight_reset($component0, $component1, $component2, $int3);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// 3268
2+
[clientscript,account_update_tabs]
3+
~account_update_display;
4+
~account_update_tabs(%varbit10060);

scripts/[clientscript,bugreport_submit].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[clientscript,bugreport_submit]
33
if (string_length(%varcstring372) > 0) {
44
sound_synth(2266, 1, 0);
5-
if (%varbit4931 < 10) {
5+
if ((%varbit4931 < 10) & (string_length(%varcstring372) >= 15)) {
66
bug_report(0, ~bugreport_parse(%varcstring372, 0), ~bugreport_parse(%varcstring373, 0));
77
}
88
if (~on_mobile = true) {
+16-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
// 2064
2-
[clientscript,chat_broadcast_op](int $int0, string $string0)
3-
def_int $int1 = -1;
2+
[clientscript,chat_broadcast_op](int $int0, string $string0, int $int1)
3+
def_int $int2 = -1;
4+
def_boolean $boolean3 = false;
45
if ($int0 = 9) {
56
%varcint202 = clientclock;
6-
$int1 = ~script553;
7-
~rebuildchatbox($int1);
8-
~rebuildpmbox($int1);
7+
$int2 = ~script553;
8+
~rebuildchatbox($int2);
9+
~rebuildpmbox($int2);
910
} else if (string_length($string0) > 0) {
10-
if ($int0 = 6) {
11-
~openurl_raw($string0, true, true);
12-
} else {
13-
mes("Link destination: <col=ef1020><$string0></col>");
11+
$boolean3 = enum(int, boolean, 2761, $int1);
12+
if (clienttype ! 3) {
13+
$boolean3 = false;
14+
}
15+
if ($boolean3 = false) {
16+
if ($int0 = 6) {
17+
~openurl_raw($string0, true, true);
18+
} else {
19+
mes("Link destination: <col=ef1020><$string0></col>");
20+
}
1421
}
1522
}
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 3203
2-
[clientscript,league_tasks_draw_list](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, component $component11, component $component12, component $component13, component $component14, int $int15)
3-
~league_tasks_draw_list($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $int15);
2+
[clientscript,league_tasks_draw_list](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, component $component11, component $component12, int $int13)
3+
~league_tasks_draw_list($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $int13);
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// 3202
2-
[clientscript,league_tasks_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, component $component11, component $component12, component $component13)
3-
if_setonvartransmit("league_tasks_draw_list(-1, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, 0){var2606}", $component3);
4-
~league_tasks_draw_list(-1, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, 0);
2+
[clientscript,league_tasks_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, component $component11)
3+
if_setonvartransmit("league_tasks_draw_list(-1, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, 0){var2606}", $component1);
4+
~league_tasks_draw_list(-1, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, 0);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 3261
2+
[clientscript,magic_training_confirm_transmit](component $component0)
3+
~magic_training_confirm($component0, %varbit10059);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// 3259
2+
[clientscript,magic_training_costs_transmit](component $component0, component $component1)
3+
~magic_training_costs($component0, %varbit10059);
4+
~magic_training_highlight_selected($component1, %varbit10059);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// 3253
2+
[clientscript,magic_training_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5)
3+
cc_deleteall($component1);
4+
cc_deleteall($component2);
5+
cc_deleteall($component3);
6+
cc_deleteall($component4);
7+
def_int $int6 = ~magic_training_rewards($component1, $component3, $component2);
8+
if_setscrollsize(0, $int6, $component1);
9+
~scrollbar_vertical($component4, $component1, "scrollbar_dragger_v2,3", "scrollbar_dragger_v2,0", "scrollbar_dragger_v2,1", "scrollbar_dragger_v2,2", "scrollbar_v2,0", "scrollbar_v2,1");
10+
~magic_training_costs_background($component3);
11+
~magic_training_confirm($component2, %varbit10059);
12+
if_setonvartransmit("magic_training_costs_transmit($component3, $component1){var2224, var210, var261, var262, var263, var264}", $component0);
13+
if_setoninvtransmit("magic_training_costs_transmit($component3, $component1){inv}", $component5);
14+
if_setonvartransmit("magic_training_confirm_transmit($component2){var2224, var210}", $component5);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 3254
2+
[clientscript,magic_training_rewards](component $component0, component $component1, component $component2)
3+
~magic_training_rewards($component0, $component1, $component2);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// 3256
2+
[clientscript,magic_training_rewards_op](int $int0, component $component1, int $int2, component $component3, component $component4)
3+
if ($int0 = 1) {
4+
%var2224 = 1;
5+
~magic_training_costs($component1, $int2);
6+
~magic_training_confirm($component3, $int2);
7+
~magic_training_highlight_selected($component4, $int2);
8+
}
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// 62
2-
[clientscript,welcome_screen2_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6)
2+
[clientscript,welcome_screen2_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
33
~script1490($component1);
44
~welcome_screen_position($component0);
55
~welcome_screen_lastlogin($component2);
66
if_setonvartransmit("welcome_screen_lastlogin($component2){var261}", $component2);
77
~welcome_screen_messages2($component3, $component4, $component5);
88
if_setonvartransmit("welcome_screen_messages2($component3, $component4, $component5){var1781}", $component4);
9-
~welcome_screen_credit2($component6);
10-
if_setonvartransmit("welcome_screen_credit2($component6){var1780}", $component6);
9+
~welcome_screen_credit2($component8, $component7, $component6);
10+
if_setonvartransmit("welcome_screen_credit2($component8, $component7, $component6){var1780}", $component8);
1111
~welcome_screen_continue_text(413:77);
1212
~welcome_screen_banner;
1313
if_setopkey(1, 13, 0, 413:3);
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 1416
2-
[clientscript,welcome_screen_credit2](component $component0)
3-
~welcome_screen_credit2($component0);
2+
[clientscript,welcome_screen_credit2](component $component0, component $component1, component $component2)
3+
~welcome_screen_credit2($component0, $component1, $component2);
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 2215
2-
[clientscript,welcome_screen_credit](component $component0)
3-
~welcome_screen_credit($component0);
2+
[clientscript,welcome_screen_credit](component $component0, component $component1, component $component2)
3+
~welcome_screen_credit($component0, $component1, $component2);

scripts/[clientscript,welcome_screen_init].cs2

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// 312
2-
[clientscript,welcome_screen_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6)
2+
[clientscript,welcome_screen_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
33
~script1490($component1);
44
~welcome_screen_position($component0);
55
~welcome_screen_lastlogin($component2);
66
if_setonvartransmit("welcome_screen_lastlogin($component2){var261}", $component2);
77
~welcome_screen_messages($component3, $component4, $component5);
88
if_setonvartransmit("welcome_screen_messages($component3, $component4, $component5){var1781}", $component4);
9-
~welcome_screen_credit($component6);
10-
if_setonvartransmit("welcome_screen_credit($component6){var1780}", $component6);
9+
~welcome_screen_credit($component8, $component6, $component7);
10+
if_setonvartransmit("welcome_screen_credit($component8, $component6, $component7){var1780}", $component8);
1111
~script2218;
1212
if_setonvartransmit("script2217{var264}", $component0);
1313
~welcome_screen_continue_text(378:85);

scripts/[proc,account_billing_update].cs2

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// 2503
22
[proc,account_billing_update]
3-
def_component $component0 = 109:15;
4-
def_component $component1 = 109:16;
5-
def_component $component2 = 109:23;
6-
def_component $component3 = 109:22;
7-
def_component $component4 = 109:34;
3+
def_component $component0 = 109:25;
4+
def_component $component1 = 109:26;
5+
def_component $component2 = 109:30;
6+
def_component $component3 = 109:28;
7+
def_component $component4 = 109:29;
88
def_component $component5 = 109:35;
99
def_component $component6 = 109:33;
10-
def_component $component7 = 109:32;
10+
def_component $component7 = 109:34;
1111
def_string $string0 = "Membership: <col=ff0000>None</col>";
1212
def_string $string1 = "Upgrade Now";
1313
def_graphic $graphic8 = 2151;
@@ -33,11 +33,11 @@ if ((%varcint103 = 1) & (%var1780 > 0)) {
3333
$string2 = "View Benefits";
3434
$graphic9 = 2150;
3535
}
36-
if_settext($string2, $component6);
36+
if_settext($string2, $component5);
37+
if_setgraphic($graphic9, $component6);
3738
if_setgraphic($graphic9, $component7);
3839
if_settext($string0, $component0);
3940
if_setop(1, $string1, $component1);
4041
if_settext($string1, $component2);
4142
if_setgraphic($graphic8, $component3);
4243
if_setgraphic($graphic8, $component4);
43-
if_setgraphic($graphic8, $component5);
+13-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
// 2505
22
[proc,account_inbox_update]
3-
def_component $component0 = 109:26;
4-
def_component $component1 = 109:24;
5-
def_component $component2 = 109:25;
3+
def_component $component0 = 109:37;
4+
def_component $component1 = 109:42;
5+
def_component $component2 = 109:40;
6+
def_component $component3 = 109:41;
67
if (%varcint228 = 1) {
7-
if_settext("Link Email", $component0);
8-
if_setgraphic(2149, $component1);
8+
if_settext("Email: <col=ff0000>Unlinked</col>", $component0);
9+
if_settext("Link Email", $component1);
910
if_setgraphic(2149, $component2);
11+
if_setgraphic(2149, $component3);
1012
return;
1113
}
12-
def_string $string0 = "Inbox: 0 unread";
14+
def_string $string0 = "Inbox: 0 unread messages";
1315
if (%var1781 > 9999) {
14-
$string0 = "Inbox: 9999+ unread";
16+
$string0 = "Inbox: 9999+ unread messages";
1517
} else if (%var1781 = 1) {
16-
$string0 = "Inbox: 1 unread";
18+
$string0 = "Inbox: 1 unread message";
1719
} else {
18-
$string0 = "Inbox: <tostring(%var1781)> unread";
20+
$string0 = "Inbox: <tostring(%var1781)> unread messages";
1921
}
2022
if_settext($string0, $component0);
21-
if_setgraphic(1706, $component1);
23+
if_settext("View Inbox", $component1);
2224
if_setgraphic(1706, $component2);
25+
if_setgraphic(1706, $component3);
+10-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
// 2506
22
[proc,account_name_update]
3-
def_component $component0 = 109:27;
4-
def_component $component1 = 109:31;
5-
def_string $string0 = "Set Name";
3+
def_component $component0 = 109:44;
4+
def_component $component1 = 109:45;
5+
def_component $component2 = 109:49;
6+
def_string $string0 = "Name: <col=ff0000>Not Set</col>";
7+
def_string $string1 = "Set Name";
68
if (%varbit8119 = 1) {
7-
$string0 = "Name Changer";
9+
$string0 = "Name: <chat_playername>";
10+
$string1 = "Name Changer";
811
}
9-
if_setop(1, $string0, $component0);
10-
if_settext($string0, $component1);
12+
if_settext($string0, $component0);
13+
if_setop(1, $string1, $component1);
14+
if_settext($string1, $component2);
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// 3270
2+
[proc,account_polls_update]
3+
def_component $component0 = 109:53;
4+
def_component $component1 = 109:54;
5+
def_component $component2 = 109:58;
6+
def_component $component3 = 109:59;
7+
def_string $string0 = "Current Poll: <col=ff0000>Inactive</col>";
8+
def_string $string1 = "View Poll";
9+
if (%varbit10065 = 1) {
10+
$string0 = "Current Poll: <col=00ff00>Active</col>";
11+
if (%varbit4337 = 1) {
12+
$string1 = "Vote Now";
13+
}
14+
if_setop(1, $string1, $component1);
15+
if_sethide(true, $component3);
16+
if_setonmouseover("text_colour_swapper($component2, 0xc0c0c0)", $component2);
17+
if_setonmouseleave("text_colour_swapper($component2, 0xf7f0df)", $component2);
18+
} else {
19+
if_setop(1, "", $component1);
20+
if_sethide(false, $component3);
21+
if_setonmouseover("text_colour_swapper($component2, 0xf7f0df)", $component2);
22+
if_setonmouseleave("text_colour_swapper($component2, 0xf7f0df)", $component2);
23+
}
24+
if_settext($string0, $component0);
25+
if_settext($string1, $component2);

scripts/[proc,account_setup_tabs].cs2

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// 3205
2+
[proc,account_setup_tabs]
3+
if_setop(1, "Account", 109:6);
4+
if_setop(1, "Community", 109:11);
5+
if_setop(1, "Useful Links", 109:16);
6+
if_setonop("account_switch_tab(0)", 109:6);
7+
if_setonop("account_switch_tab(1)", 109:11);
8+
if_setonop("account_switch_tab(2)", 109:16);
9+
if (~on_mobile = true) {
10+
return;
11+
}
12+
if_setonmouserepeat("account_tab_highlight(109:7, 109:8, 109:9, 0)", 109:6);
13+
if_setonmouserepeat("account_tab_highlight(109:12, 109:13, 109:14, 1)", 109:11);
14+
if_setonmouserepeat("account_tab_highlight(109:17, 109:18, 109:19, 2)", 109:16);
15+
if_setonmouseleave("account_tab_highlight_reset(109:7, 109:8, 109:9, 0)", 109:6);
16+
if_setonmouseleave("account_tab_highlight_reset(109:12, 109:13, 109:14, 1)", 109:11);
17+
if_setonmouseleave("account_tab_highlight_reset(109:17, 109:18, 109:19, 2)", 109:16);
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// 3265
2+
[proc,account_tab_highlight](component $component0, component $component1, component $component2, int $int3)
3+
if (%varbit10060 = $int3) {
4+
return;
5+
}
6+
if_setgraphic("tabs_tall,4", $component0);
7+
if_setgraphic("tabs_tall,5", $component1);
8+
if_setgraphic("tabs_tall,4", $component2);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// 3266
2+
[proc,account_tab_highlight_reset](component $component0, component $component1, component $component2, int $int3)
3+
if (%varbit10060 = $int3) {
4+
if_setgraphic("tabs_tall,0", $component0);
5+
if_setgraphic("tabs_tall,1", $component1);
6+
if_setgraphic("tabs_tall,0", $component2);
7+
} else {
8+
if_setgraphic("tabs_tall,2", $component0);
9+
if_setgraphic("tabs_tall,3", $component1);
10+
if_setgraphic("tabs_tall,2", $component2);
11+
}

scripts/[proc,account_update_display].cs2

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
~account_billing_update;
55
~account_inbox_update;
66
~account_name_update;
7+
~account_polls_update;

0 commit comments

Comments
 (0)