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

Commit ede39d9

Browse files
hunterwbhunterwb
committed
189.8
1 parent d9c2caf commit ede39d9

25 files changed

+208
-87
lines changed

‎README.md

+7
Original file line numberDiff line numberDiff line change
@@ -3423,3 +3423,10 @@
34233423
[**3420**](scripts/[clientscript,highlight_next].cs2) `[clientscript,highlight_next]`
34243424
[**3421**](scripts/script3421.cs2)
34253425
[**3422**](scripts/script3422.cs2)
3426+
[**3423**](scripts/script3423.cs2)
3427+
[**3424**](scripts/script3424.cs2)
3428+
[**3425**](scripts/script3425.cs2)
3429+
[**3426**](scripts/script3426.cs2)
3430+
[**3427**](scripts/script3427.cs2)
3431+
[**3428**](scripts/script3428.cs2)
3432+
[**3429**](scripts/script3429.cs2)

‎scripts/[clientscript,hp_hud_fade_in].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 2887
2-
[clientscript,hp_hud_fade_in](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, int $int7)
3-
~hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $int7);
2+
[clientscript,hp_hud_fade_in](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, int $int11)
3+
~hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $int11);

‎scripts/[clientscript,hp_hud_fade_in_check].cs2

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 2886
2-
[clientscript,hp_hud_fade_in_check](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6)
3-
def_int $int7 = if_gettrans($component0);
4-
if ($int7 > 0) {
5-
~hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $int7);
2+
[clientscript,hp_hud_fade_in_check](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10)
3+
def_int $int11 = if_gettrans($component0);
4+
if ($int11 > 0) {
5+
~hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $int11);
66
}

‎scripts/[clientscript,hp_hud_fade_out].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 2889
2-
[clientscript,hp_hud_fade_out](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, int $int7)
3-
~hp_hud_fade_out($component0, $component1, $component2, $component3, $component4, $component5, $component6, $int7);
2+
[clientscript,hp_hud_fade_out](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, int $int11)
3+
~hp_hud_fade_out($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $int11);

‎scripts/[clientscript,hp_hud_init].cs2

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
11
// 2099
2-
[clientscript,hp_hud_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, component $component14, component $component15, component $component16)
3-
~script2249($component3, setbit(0, 3));
4-
~script1486($component4, ^setpos_abs_centre, 1, 0);
5-
~script2249($component5, setbit(setbit(0, 3), 4));
6-
~script1486($component6, ^setpos_abs_left, 1, 0);
7-
~script1490($component1);
8-
~hud_clamp_init($component2);
9-
~hp_hud_fade_in($component14, $component15, $component13, $component16, $component11, $component12, $component10, 255);
10-
if_setonsubchange("hp_hud_pos(0, $component0, $component7, $component8, $component9, $component13, $component10, $component11, $component12)", $component0);
11-
if_setonvartransmit("hp_hud_update($component10, $component11, $component12, $component8, $component13, false){var1682, var1683}", $component10);
12-
~hp_hud_pos(0, $component0, $component7, $component8, $component9, $component13, $component10, $component11, $component12);
13-
~hp_hud_update($component10, $component11, $component12, $component8, $component13, true);
2+
[clientscript,hp_hud_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, component $component14, component $component15, component $component16, component $component17, component $component18, component $component19, component $component20)
3+
~script3427($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20);

‎scripts/[clientscript,hp_hud_pos].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 2100
2-
[clientscript,hp_hud_pos](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
3-
~hp_hud_pos($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8);
2+
[clientscript,hp_hud_pos](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)
3+
~hp_hud_pos($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12);

‎scripts/[clientscript,hp_hud_update].cs2

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

‎scripts/[clientscript,raids_fadein].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 1513
22
[clientscript,raids_fadein]
3-
~raids_fader_update(0, 255, 0, interface_513:1);
3+
~raids_fader_update(0, 255, 0, interface_513:2);

‎scripts/[clientscript,raids_fadeout].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 1512
22
[clientscript,raids_fadeout]
3-
~raids_fader_update(255, 0, 0, interface_513:1);
3+
~raids_fader_update(255, 0, 0, interface_513:2);

‎scripts/[clientscript,raids_overlay_init].cs2

+20-9
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,34 @@
11
// 1505
2-
[clientscript,raids_overlay_init](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5)
2+
[clientscript,raids_overlay_init](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6)
3+
def_string $string0 = ~tostring_spacer(5000000, ",");
4+
def_string $string1 = ~tostring_spacer(131071, ",");
5+
def_int $int7 = parawidth("Total: <$string0>", 512, p12_full);
6+
def_int $int8 = parawidth("<chat_playername>: <$string1>", 512, p12_full);
7+
def_int $int9 = $int7;
8+
if ($int8 > $int7) {
9+
$int9 = $int8;
10+
}
311
~script1490($component1);
412
~hud_clamp_init($component2);
513
~script2249($component3, setbit(0, 3));
614
~script1486($component4, ^setpos_abs_left, 1, 0);
715
if_setposition(2, 2, ^setpos_abs_left, ^setpos_abs_top, $component5);
16+
if (~on_mobile = true) {
17+
if_setposition(calc($int9 + 30), 2, ^setpos_abs_left, ^setpos_abs_top, $component6);
18+
}
819
cc_deleteall($component5);
9-
def_int $int6 = 0;
10-
cc_create($component5, ^iftype_graphic, $int6);
11-
$int6 = calc($int6 + 1);
20+
def_int $int10 = 0;
21+
cc_create($component5, ^iftype_graphic, $int10);
22+
$int10 = calc($int10 + 1);
1223
cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);
1324
cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
1425
cc_settiling(true);
1526
cc_setgraphic("tradebacking");
16-
$int6 = ~thinstonebox($component5, $int6);
17-
cc_create($component5, ^iftype_text, $int6);
18-
$int6 = calc($int6 + 1);
19-
.cc_create($component5, ^iftype_text, $int6);
20-
$int6 = calc($int6 + 1);
27+
$int10 = ~thinstonebox($component5, $int10);
28+
cc_create($component5, ^iftype_text, $int10);
29+
$int10 = calc($int10 + 1);
30+
.cc_create($component5, ^iftype_text, $int10);
31+
$int10 = calc($int10 + 1);
2132
cc_setsize(8, 0, ^setsize_minus, ^setsize_minus);
2233
.cc_setsize(8, 0, ^setsize_minus, ^setsize_minus);
2334
cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);

‎scripts/[proc,hp_hud_fade_in].cs2

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
// 2888
2-
[proc,hp_hud_fade_in](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, int $int7)
3-
$int7 = ~max(0, calc($int7 - 3));
4-
if_settrans($int7, $component0);
5-
if_settrans($int7, $component1);
6-
if_settrans($int7, $component3);
7-
if_settrans($int7, $component4);
8-
if_settrans($int7, $component5);
9-
if ($int7 <= 0) {
2+
[proc,hp_hud_fade_in](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, int $int11)
3+
$int11 = ~max(0, calc($int11 - 3));
4+
if_settrans($int11, $component0);
5+
if_settrans($int11, $component1);
6+
if_settrans($int11, $component3);
7+
if_settrans($int11, $component4);
8+
if_settrans($int11, $component5);
9+
if_settrans($int11, $component7);
10+
if_settrans($int11, $component8);
11+
if_settrans($int11, $component9);
12+
if_settrans($int11, $component10);
13+
if ($int11 <= 0) {
1014
if_sethide(false, $component2);
1115
if_sethide(false, $component6);
1216
if_setontimer(null, $component0);
1317
return;
1418
}
15-
if_setontimer("hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $int7)", $component0);
19+
if_setontimer("hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $int11)", $component0);

‎scripts/[proc,hp_hud_fade_out].cs2

+14-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
// 2890
2-
[proc,hp_hud_fade_out](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, int $int7)
3-
if ($int7 <= 0) {
2+
[proc,hp_hud_fade_out](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, int $int11)
3+
if ($int11 <= 0) {
44
if_sethide(true, $component2);
55
if_sethide(true, $component6);
66
}
7-
$int7 = ~min(255, calc($int7 + 3));
8-
if_settrans($int7, $component0);
9-
if_settrans($int7, $component1);
10-
if_settrans($int7, $component3);
11-
if_settrans($int7, $component4);
12-
if_settrans($int7, $component5);
13-
if ($int7 >= 255) {
7+
$int11 = ~min(255, calc($int11 + 3));
8+
if_settrans($int11, $component0);
9+
if_settrans($int11, $component1);
10+
if_settrans($int11, $component3);
11+
if_settrans($int11, $component4);
12+
if_settrans($int11, $component5);
13+
if_settrans($int11, $component7);
14+
if_settrans($int11, $component8);
15+
if_settrans($int11, $component9);
16+
if_settrans($int11, $component10);
17+
if ($int11 >= 255) {
1418
if_setontimer(null, $component0);
1519
return;
1620
}
17-
if_setontimer("hp_hud_fade_out($component0, $component1, $component2, $component3, $component4, $component5, $component6, $int7)", $component0);
21+
if_setontimer("hp_hud_fade_out($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $int11)", $component0);

‎scripts/[proc,hp_hud_pos].cs2

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
// 2101
2-
[proc,hp_hud_pos](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
3-
def_int $int9 = if_getwidth($component1);
4-
def_boolean $boolean10 = false;
5-
def_int $int11 = scale(1, 4, $int9);
6-
$int11 = ~max($int11, 200);
7-
$int11 = ~min($int11, 600);
8-
if ($int0 = $int11) {
2+
[proc,hp_hud_pos](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)
3+
def_int $int13 = if_getwidth($component1);
4+
def_boolean $boolean14 = false;
5+
def_int $int15 = scale(1, 4, $int13);
6+
$int15 = ~max($int15, 200);
7+
$int15 = ~min($int15, 600);
8+
if ($int0 = $int15) {
99
return;
1010
}
11-
if ($int11 ! if_getwidth($component2)) {
12-
if_setsize($int11, 42, ^setsize_abs, ^setsize_abs, $component2);
13-
$boolean10 = true;
11+
if ($int15 ! if_getwidth($component2)) {
12+
if_setsize($int15, 42, ^setsize_abs, ^setsize_abs, $component2);
13+
$boolean14 = true;
1414
}
1515
if (~on_mobile = false) {
1616
if_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_top, $component2);
1717
} else {
1818
if_setposition(0, 0, ^setpos_abs_left, ^setpos_abs_top, $component2);
1919
}
2020
if_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_top, $component3);
21-
if_setontimer("hp_hud_pos($int11, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8)", $component1);
22-
~hp_hud_update($component6, $component7, $component8, $component3, $component5, $boolean10);
21+
if_setontimer("hp_hud_pos($int15, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12)", $component1);
22+
~hp_hud_update($component6, $component7, $component8, $component3, $component5, $component9, $component10, $component11, $component12, $boolean14);

‎scripts/[proc,hp_hud_update].cs2

+36-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// 2103
2-
[proc,hp_hud_update](component $component0, component $component1, component $component2, component $component3, component $component4, boolean $boolean5)
2+
[proc,hp_hud_update](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, boolean $boolean9)
33
def_string $string0 = nc_param(%var1683, param_510);
44
if (compare($string0, "") = 0) {
55
if_sethide(true, $component3);
@@ -9,18 +9,43 @@ if (compare($string0, "") = 0) {
99
}
1010
def_string $string1 = "<tostring(%varbit6099)> / <tostring(%varbit6100)>";
1111
if_settext($string1, $component0);
12-
def_int $int6 = if_getwidth($component1);
13-
def_int $int7 = $int6;
14-
$int7 = scale(%varbit6099, %varbit6100, $int7);
15-
if (($int7 = 0) & (%varbit6099 > 0)) {
16-
$int7 = 1;
12+
def_int $int10 = if_getwidth($component1);
13+
def_int $int11 = $int10;
14+
def_int $int12 = calc(%varbit6100 + 1);
15+
$int11 = scale(%varbit6099, %varbit6100, $int11);
16+
if ((%varbit10338 > 0) & (%varbit10338 <= $int12)) {
17+
if_sethide(false, $component5);
18+
if_setposition(scale(calc(%varbit10338 - 1), %varbit6100, $int10), 0, ^setpos_abs_left, ^setpos_abs_centre, $component5);
19+
} else {
20+
if_sethide(true, $component5);
21+
}
22+
if ((%varbit10339 > 0) & (%varbit10339 <= $int12)) {
23+
if_sethide(false, $component6);
24+
if_setposition(calc($int10 - scale((%varbit10339 - 1), %varbit6100, $int10)), 0, ^setpos_abs_right, ^setpos_abs_centre, $component6);
25+
} else {
26+
if_sethide(true, $component6);
27+
}
28+
if ((%varbit10340 > 0) & (%varbit10340 <= $int12)) {
29+
if_sethide(false, $component7);
30+
if_setposition(scale(calc(%varbit10340 - 1), %varbit6100, $int10), 0, ^setpos_abs_left, ^setpos_abs_centre, $component7);
31+
} else {
32+
if_sethide(true, $component7);
33+
}
34+
if ((%varbit10341 > 0) & (%varbit10341 <= $int12)) {
35+
if_sethide(false, $component8);
36+
if_setposition(scale(calc(%varbit10341 - 1), %varbit6100, $int10), 0, ^setpos_abs_left, ^setpos_abs_centre, $component8);
37+
} else {
38+
if_sethide(true, $component8);
39+
}
40+
if (($int11 = 0) & (%varbit6099 > 0)) {
41+
$int11 = 1;
1742
}
18-
if (($int7 = if_getwidth($component1)) & (%varbit6099 < %varbit6100)) {
19-
$int7 = calc($int7 - 1);
43+
if (($int11 = if_getwidth($component1)) & (%varbit6099 < %varbit6100)) {
44+
$int11 = calc($int11 - 1);
2045
}
21-
if ($boolean5 = true) {
22-
if_setsize($int7, if_getheight($component2), ^setsize_abs, ^setsize_abs, $component2);
46+
if ($boolean9 = true) {
47+
if_setsize($int11, if_getheight($component2), ^setsize_abs, ^setsize_abs, $component2);
2348
if_setontimer(null, $component2);
2449
return;
2550
}
26-
if_setontimer("hp_hud_update_bar($component2, $int7)", $component2);
51+
if_setontimer("hp_hud_update_bar($component2, $int11)", $component2);

‎scripts/[proc,max].cs2

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// 1045
22
[proc,max](int $int0, int $int1)(int)
3-
def_int $int2 = 0;
43
if ($int0 > $int1) {
5-
$int2 = $int0;
6-
} else {
7-
$int2 = $int1;
4+
return($int0);
85
}
9-
return($int2);
6+
return($int1);

‎scripts/[proc,min].cs2

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// 1046
22
[proc,min](int $int0, int $int1)(int)
3-
def_int $int2 = 0;
43
if ($int0 < $int1) {
5-
$int2 = $int0;
6-
} else {
7-
$int2 = $int1;
4+
return($int0);
85
}
9-
return($int2);
6+
return($int1);

‎scripts/script3358.cs2

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ switch_struct ($struct0) {
2121
if (%varbit10236 = 0) {
2222
$boolean1 = true;
2323
}
24+
case health_overlay_1277 :
25+
if (%varbit10345 = 0) {
26+
$boolean1 = true;
27+
}
2428
}
2529
if ($boolean1 = true) {
2630
cc_setop(1, "Disable");

‎scripts/script3359.cs2

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ if ((cc_find($component1, $int2) = ^true) & (.cc_find($component1, $int3) = ^tru
2020
%varbit10113 = calc(1 - %varbit10113);
2121
case hitsplat_tinting_1273 :
2222
%varbit10236 = calc(1 - %varbit10236);
23+
case health_overlay_1277 :
24+
%varbit10345 = calc(1 - %varbit10345);
2325
}
2426
~script3358($struct4);
2527
}

‎scripts/script3423.cs2

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// 3423
2+
script3423(component $component0, component $component1)
3+
if_setopbase("<col=ff9040>Health Overlay</col>", $component0);
4+
if_setonmouseleave("deltooltip($component1)", $component0);
5+
~script3426($component0, $component1);
6+
if_setonvartransmit("script3424($component0, $component1){var1425}", $component0);
7+
if_setonop("script3425(event_opindex, $component0, $component1)", $component0);

‎scripts/script3424.cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 3424
2+
script3424(component $component0, component $component1)
3+
~script3426($component0, $component1);

‎scripts/script3425.cs2

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// 3425
2+
script3425(int $int0, component $component1, component $component2)
3+
if ($int0 ! 1) {
4+
return;
5+
}
6+
sound_synth(synth_2266, 1, 0);
7+
if (%varbit10345 = 0) {
8+
%varbit10345 = 1;
9+
} else {
10+
%varbit10345 = 0;
11+
}
12+
~script3426($component1, $component2);

‎scripts/script3426.cs2

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// 3426
2+
script3426(component $component0, component $component1)
3+
def_string $string0 = "Health Overlay (currently on)";
4+
if (%varbit10345 = 1) {
5+
$string0 = "Health Overlay (currently off)";
6+
if_setgraphic("options_boxes,0", $component0);
7+
if_setop(1, "Enable", $component0);
8+
} else {
9+
if_setgraphic("options_boxes,1", $component0);
10+
if_setop(1, "Disable", $component0);
11+
}
12+
if_setonmouserepeat("tooltip_mouserepeat($component0, -1, $component1, $string0, 25, 512)", $component0);
13+
%varcint2 = 0;

0 commit comments

Comments
 (0)