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

Commit 88cbe10

Browse files
Joshua-FJoshua-F
committed
213.4
1 parent 6408e7f commit 88cbe10

Some content is hidden

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

57 files changed

+1399
-77
lines changed

‎README.md

+43
Original file line numberDiff line numberDiff line change
@@ -7136,6 +7136,27 @@
71367136
[**7134**](scripts/[clientscript,script7134].cs2)
71377137
[**7135**](scripts/[proc,script7135].cs2)
71387138
[**7136**](scripts/[proc,script7136].cs2)
7139+
[**7137**](scripts/[proc,script7137].cs2)
7140+
[**7138**](scripts/[clientscript,script7138].cs2)
7141+
[**7139**](scripts/[proc,script7139].cs2)
7142+
[**7140**](scripts/[clientscript,script7140].cs2)
7143+
[**7141**](scripts/[clientscript,script7141].cs2)
7144+
[**7142**](scripts/[proc,script7142].cs2)
7145+
[**7143**](scripts/[proc,script7143].cs2)
7146+
[**7144**](scripts/[proc,script7144].cs2)
7147+
[**7145**](scripts/[clientscript,script7145].cs2)
7148+
[**7146**](scripts/[clientscript,script7146].cs2)
7149+
[**7147**](scripts/[proc,script7147].cs2)
7150+
[**7148**](scripts/[clientscript,script7148].cs2)
7151+
[**7149**](scripts/[clientscript,script7149].cs2)
7152+
[**7150**](scripts/[proc,script7150].cs2)
7153+
[**7151**](scripts/[clientscript,script7151].cs2)
7154+
[**7152**](scripts/[proc,script7152].cs2)
7155+
[**7153**](scripts/[proc,script7153].cs2)
7156+
[**7154**](scripts/[clientscript,script7154].cs2)
7157+
[**7155**](scripts/[clientscript,script7155].cs2)
7158+
[**7156**](scripts/[clientscript,script7156].cs2)
7159+
[**7157**](scripts/[clientscript,script7157].cs2)
71397160
[**7158**](scripts/[proc,script7158].cs2)
71407161
[**7159**](scripts/[proc,script7159].cs2)
71417162
[**7160**](scripts/[proc,script7160].cs2)
@@ -7223,3 +7244,25 @@
72237244
[**7242**](scripts/[proc,script7242].cs2)
72247245
[**7243**](scripts/[proc,script7243].cs2)
72257246
[**7244**](scripts/[proc,script7244].cs2)
7247+
[**7245**](scripts/[proc,script7245].cs2)
7248+
[**7246**](scripts/[clientscript,script7246].cs2)
7249+
[**7247**](scripts/[clientscript,script7247].cs2)
7250+
[**7248**](scripts/[proc,script7248].cs2)
7251+
[**7249**](scripts/[proc,script7249].cs2)
7252+
[**7250**](scripts/[proc,script7250].cs2)
7253+
[**7251**](scripts/[clientscript,script7251].cs2)
7254+
[**7252**](scripts/[clientscript,script7252].cs2)
7255+
[**7253**](scripts/[clientscript,script7253].cs2)
7256+
[**7254**](scripts/[proc,script7254].cs2)
7257+
[**7255**](scripts/[proc,script7255].cs2)
7258+
[**7256**](scripts/[clientscript,script7256].cs2)
7259+
[**7257**](scripts/[proc,script7257].cs2)
7260+
[**7258**](scripts/[clientscript,script7258].cs2)
7261+
[**7259**](scripts/[proc,script7259].cs2)
7262+
[**7260**](scripts/[proc,script7260].cs2)
7263+
[**7261**](scripts/[proc,script7261].cs2)
7264+
[**7262**](scripts/[proc,script7262].cs2)
7265+
[**7263**](scripts/[proc,script7263].cs2)
7266+
[**7264**](scripts/[proc,script7264].cs2)
7267+
[**7265**](scripts/[proc,script7265].cs2)
7268+
[**7266**](scripts/[proc,script7266].cs2)

‎scripts/[clientscript,loading_icon_init].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 4217
22
[clientscript,loading_icon_init](component $component0, component $component1, enum $enum2, int $int3, int $int4, int $int5, int $int6, int $int7, int $int8, int $int9, string $text0)
3-
~loading_icon_init($component0, $component1, $enum2, $int3, $int4, $int5, $int6, $int7, $int8, $int9, $text0);
3+
~script7137($component0, $component1, $enum2, $int3, $int4, $int5, $int6, $int7, $int8, $int9, $text0, 0, 0);

‎scripts/[clientscript,script13].cs2

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ if (~target_world = 0) {
55
if_setontimer(null, $component0);
66
return;
77
}
8-
def_int $int1 = interpolate(0, 60, 0, 100, %varbit877);
8+
def_int $int1 = calc(200 - %varbit14890);
9+
$int1 = interpolate(0, 60, 0, 100, $int1);
910
def_int $clock2 = clientclock;
1011
if_setontimer("script14($component0, $int1, $clock2)", $component0);
1112
~script15($component0, $int1, $clock2);

‎scripts/[clientscript,script3149].cs2

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// 3149
2-
[clientscript,script3149](int $clock0, int $int1, component $component2, component $component3, component $component4)
2+
[clientscript,script3149](int $clock0, int $int1, component $component2, component $component3, component $component4, int $int5)
33
if (clientclock < $clock0) {
44
return;
55
}
6-
~script3150($int1, $component3);
6+
~script3150($int1, $component3, $component4, $int5);
77
if ($int1 > -2) {
8-
if_setontimer("script3149(calc($clock0 + 50), calc($int1 - 1), $component2, $component3, $component4)", $component2);
8+
if_setontimer("script3149(calc($clock0 + 50), calc($int1 - 1), $component2, $component3, $component4, $int5)", $component2);
99
} else {
1010
if_sethide(true, $component4);
1111
if_sethide(true, $component3);

‎scripts/[clientscript,script7138].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 7138
2+
[clientscript,script7138](component $component0, string $string0, boolean $boolean1, boolean $boolean2)
3+
~script7139($component0, $string0, $boolean1, $boolean2);

‎scripts/[clientscript,script7140].cs2

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// 7140
2+
[clientscript,script7140](dbrow $dbrow0, inv $inv1)
3+
if (%var3874 ! $dbrow0) {
4+
%var3869 = -1;
5+
%var3870 = -1;
6+
%var3872 = 0;
7+
}
8+
def_component $component2 = interface_819:0;
9+
if_setontimer("script6110($component2, -1)", $component2);
10+
if_setonresize("script7141($dbrow0, $inv1, true)", $component2);
11+
if ($inv1 ! null) {
12+
if_setoninvtransmit("script7141($dbrow0, $inv1, true){$inv1}", $component2);
13+
}
14+
~script7147($dbrow0, $inv1, %var3869, 0, 0, 0, null, "", true);

‎scripts/[clientscript,script7141].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 7141
2+
[clientscript,script7141](dbrow $dbrow0, inv $inv1, boolean $boolean2)
3+
~script7142($dbrow0, $inv1, $boolean2);

‎scripts/[clientscript,script7145].cs2

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// 7145
2+
[clientscript,script7145](dbrow $dbrow0, inv $inv1, int $int2, int $opindex3)
3+
def_component $component4 = interface_819:5;
4+
def_int $int5 = 53674013;
5+
if ($opindex3 = 1) {
6+
sound_synth(interface_select1, 1, 0);
7+
~script7143($dbrow0, $inv1, $int2, 0);
8+
if (%var3871 = 0) {
9+
~script7147($dbrow0, $inv1, $int2, 0, 0, 0, null, "", true);
10+
} else {
11+
if ($int2 ! %var3869) {
12+
~script7147($dbrow0, $inv1, $int2, 0, 0, 0, null, "", true);
13+
}
14+
if_sethide(false, $component4);
15+
}
16+
}

‎scripts/[clientscript,script7146].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 7146
2+
[clientscript,script7146](dbrow $dbrow0, inv $inv1, int $int2, int $int3, int $int4, int $int5, dbrow $dbrow6, string $string0, boolean $boolean7)
3+
~script7147($dbrow0, $inv1, $int2, $int3, $int4, $int5, $dbrow6, $string0, $boolean7);

‎scripts/[clientscript,script7148].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 7148
2+
[clientscript,script7148]
3+
~script7150;

‎scripts/[clientscript,script7149].cs2

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// 7149
2+
[clientscript,script7149](int $key0)
3+
if (~keypress_permit(null, null) = 0) {
4+
return;
5+
}
6+
def_enum $enum1 = ~toplevel_getcomponents;
7+
if ($enum1 = null) {
8+
return;
9+
}
10+
def_component $component2 = enum(component, component, $enum1, toplevel_osrs_stretch:16);
11+
if ($component2 ! null & $key0 = ^key_escape & %varbit4681 = 1 & if_hassub($component2) = true) {
12+
~script7150;
13+
}

‎scripts/[clientscript,script7151].cs2

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// 7151
2+
[clientscript,script7151](int $int0)
3+
def_component $component1 = interface_819:23;
4+
def_component $component2 = interface_819:40;
5+
if_settext(tostring($int0), $component1);
6+
if_settext(tostring($int0), $component2);

‎scripts/[clientscript,script7154].cs2

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// 7154
2+
[clientscript,script7154](dbrow $dbrow0, inv $inv1, int $opindex2)
3+
def_component $component3 = interface_819:5;
4+
def_component $component4 = interface_819:8;
5+
if ($opindex2 = 1) {
6+
sound_synth(interface_select1, 1, 0);
7+
~script7143($dbrow0, $inv1, -1, 0);
8+
~script7147($dbrow0, $inv1, -1, 0, 0, 0, null, "", true);
9+
if_sethide(false, $component3);
10+
if (cc_find($component4, 0) = ^true) {
11+
cc_setgraphic("menu_buttons,2");
12+
}
13+
}

‎scripts/[clientscript,script7155].cs2

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// 7155
2+
[clientscript,script7155](dbrow $dbrow0, inv $inv1)
3+
if (%var3871 = 1) {
4+
%var3871 = 0;
5+
} else {
6+
%var3871 = 1;
7+
}
8+
%var3869 = -1;
9+
~script7147($dbrow0, $inv1, -1, 0, 0, 0, null, "", true);
10+
~script7142($dbrow0, $inv1, true);

‎scripts/[clientscript,script7156].cs2

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// 7156
2+
[clientscript,script7156](component $component0, component $component1, component $component2, component $component3, enum $enum4, int $colour5)
3+
sound_synth(interface_select1, 1, 0);
4+
~script5772($component0, $component1, $component2, $component3, $enum4, $colour5);
5+
def_int $count6 = 0;
6+
while ($count6 < enum_getoutputcount($enum4)) {
7+
if (cc_find($component1, calc(1 + $count6 * 2)) = ^true) {
8+
cc_setonop("script7157($component0, $component3, $count6, $enum4, $colour5)");
9+
}
10+
$count6 = calc($count6 + 1);
11+
}

‎scripts/[clientscript,script7157].cs2

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// 7157
2+
[clientscript,script7157](component $component0, component $component1, int $count2, enum $enum3, int $colour4)
3+
def_component $component5 = interface_819:0;
4+
sound_synth(interface_select1, 1, 0);
5+
%var3872 = $count2;
6+
%var3869 = -1;
7+
~script5770($component0, $component1, $count2, $enum3, $colour4);
8+
if_callonresize($component5);

‎scripts/[clientscript,script7246].cs2

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// 7246
2+
[clientscript,script7246](dbrow $dbrow0)
3+
def_component $component1 = interface_806:0;
4+
cc_deleteall($component1);
5+
def_int $size2 = inv_size(inv);
6+
def_int $size3 = 0;
7+
while ($size3 < $size2) {
8+
cc_create($component1, ^iftype_graphic, $size3);
9+
cc_setsize(36, 32, ^setsize_abs, ^setsize_abs);
10+
cc_setgraphicshadow(0x333333);
11+
cc_setoutline(1);
12+
cc_setdragdeadzone(5);
13+
cc_setdragdeadtime(5);
14+
$size3 = calc($size3 + 1);
15+
}
16+
~script7248($dbrow0);
17+
if_setoninvtransmit("script7247($dbrow0){inv}", $component1);

‎scripts/[clientscript,script7247].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 7247
2+
[clientscript,script7247](dbrow $dbrow0)
3+
~script7248($dbrow0);

‎scripts/[clientscript,script7251].cs2

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// 7251
2+
[clientscript,script7251](int $opindex0, component $component1, int $comsubid2, int $trans3, int $trans4, dbrow $dbrow5)
3+
if ($opindex0 ! 10) {
4+
sound_synth(interface_select1, 1, 0);
5+
}
6+
if (cc_find($component1, $comsubid2) = ^true) {
7+
cc_settrans($trans3);
8+
cc_setontimer("cc_settrans_temporarily_end(event_com, event_comsubid, $trans4, calc(clientclock + 10))");
9+
}
10+
if ($opindex0 = 1) {
11+
~script7254($comsubid2, $dbrow5, 0, 0, 0, 0, "");
12+
}

‎scripts/[clientscript,script7252].cs2

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// 7252
2+
[clientscript,script7252](component $drop0, int $comsubid1, component $drop2, int $dropsubid3, string $string0, dbrow $dbrow4)
3+
def_int $size5 = inv_size(inv);
4+
if ($comsubid1 < 0 | $comsubid1 >= $size5) {
5+
return;
6+
}
7+
if ($dropsubid3 < 0 | $dropsubid3 >= $size5) {
8+
return;
9+
}
10+
if ($drop0 ! $drop2) {
11+
return;
12+
}
13+
def_obj $obj6 = inv_getobj(inv, $comsubid1);
14+
if ($obj6 = null) {
15+
return;
16+
}
17+
def_obj $obj7 = inv_getobj(inv, $dropsubid3);
18+
if (cc_find($drop0, $dropsubid3) = ^true) {
19+
~script7249($obj6, inv_getnum(inv, $comsubid1), $string0, $dbrow4);
20+
}
21+
if (cc_find($drop0, $comsubid1) = ^true) {
22+
if ($obj7 ! null) {
23+
~script7249($obj7, inv_getnum(inv, $dropsubid3), $string0, $dbrow4);
24+
} else {
25+
~script7250;
26+
}
27+
}

‎scripts/[clientscript,script7253].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 7253
2+
[clientscript,script7253](int $slot0, dbrow $dbrow1, int $int2, int $int3, int $int4, int $int5, string $string0)
3+
~script7254($slot0, $dbrow1, $int2, $int3, $int4, $int5, $string0);

‎scripts/[clientscript,script7256].cs2

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// 7256
2+
[clientscript,script7256]
3+
def_component $component0 = interface_806:0;
4+
def_component $component1 = interface_806:1;
5+
if_sethide(false, $component0);
6+
if_sethide(true, $component1);
7+
%var3870 = -1;

‎scripts/[clientscript,script7258].cs2

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// 7258
2+
[clientscript,script7258](int $int0, int $int1)
3+
switch_int ($int0) {
4+
case 2486 :
5+
%var3436 = $int1;
6+
case 2466 :
7+
%var3814 = $int1;
8+
case default :
9+
~debug_mes("Error: omnishop_var_setter called with unknown ID");
10+
}

‎scripts/[clientscript,target_system_init].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,4 @@ if_setonmouseleave("graphic_swapper(event_com, $graphic14)", $component6);
5151
~target_system_redraw($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component10);
5252
if_setonvartransmit("target_system_redraw($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component10){var1130, var1795}", $component0);
5353
~script3148($component7, $component8, $component9);
54-
if_setonvartransmit("script3147($component7, $component8, $component9){var1542}", $component7);
54+
if_setonvartransmit("script3147($component7, $component8, $component9){var1542, var3812, var1130}", $component7);

‎scripts/[proc,hh_get_status].cs2

+13-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,19 @@ if ($coord8 ! null) {
3838
if (testbit($flags3, 0) = ^true) {
3939
return(1, 1);
4040
}
41-
} else if ($loc0 = inconspicuous_bush_master_multi_29060 & testbit($flags3, 11) = ^true) {
41+
} else if ($loc0 = inconspicuous_bush_master_multi_29060) {
42+
if (testbit($flags3, 11) = ^true) {
43+
return(1, 1);
44+
}
45+
} else if ($loc0 = inconspicuous_crate_elite_multi_29024) {
46+
if (testbit($flags2, 27) = ^true) {
47+
return(1, 1);
48+
}
49+
} else if ($loc0 = inconspicuous_rocks_elite_multi_29035) {
50+
if (testbit($flags3, 1) = ^true) {
51+
return(1, 1);
52+
}
53+
} else if ($loc0 = inconspicuous_hole_master_multi_29040 & testbit($flags3, 2) = ^true) {
4254
return(1, 1);
4355
}
4456
return(1, 0);

‎scripts/[proc,loading_icon_init].cs2

+1-31
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,3 @@
11
// 4218
22
[proc,loading_icon_init](component $component0, component $component1, enum $enum2, int $int3, int $int4, int $int5, int $int6, int $int7, int $int8, int $int9, string $text0)
3-
if ($component1 ! null) {
4-
if_settext($text0, $component1);
5-
}
6-
def_int $count10 = enum_getoutputcount($enum2);
7-
if ($count10 = 0) {
8-
return;
9-
}
10-
def_int $int11 = ~min(if_getwidth($component0), if_getheight($component0));
11-
def_int $int12 = calc($int11 / 4);
12-
def_int $int13 = calc(360 / $count10);
13-
def_int $int14 = calc(360 % $count10);
14-
def_int $int15 = calc((if_getwidth($component0) - $int12) / 2);
15-
def_int $int16 = calc((if_getheight($component0) - $int12) / 2);
16-
def_int $x17 = 0;
17-
def_int $y18 = 0;
18-
def_int $count19 = 0;
19-
def_obj $obj20 = null;
20-
def_int $int21 = 0;
21-
def_int $int22 = calc(($int5 - $int4) / $count10);
22-
while ($count19 < $count10) {
23-
if ($int14 > 0) {
24-
$int21 = calc($int21 + 1);
25-
$int14 = calc($int14 - 1);
26-
}
27-
$obj20 = enum(int, obj, $enum2, $count19);
28-
$x17 = calc($int15 + scale(~cos_deg($int21), 100000, $int9));
29-
$y18 = calc($int16 + scale(~sin_deg($int21), 100000, $int9));
30-
~loading_icon_draw($x17, $y18, $count19, $component0, $obj20, $int12, $int3, $int4, $int5, $int6, $int7, $int8, $int22);
31-
$int21 = calc($int21 + $int13);
32-
$count19 = calc($count19 + 1);
33-
}
3+
~script7137($component0, $component1, $enum2, $int3, $int4, $int5, $int6, $int7, $int8, $int9, $text0, 0, 0);

‎scripts/[proc,pvp_icons_layout].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ if (~pvp_world = 1) {
223223
if_setonop(null, interface_90:46);
224224
%varbit10531 = 0;
225225
}
226-
if (~target_world = 1 & (%varbit877 > 0 | %varbit5963 = 1)) {
226+
if (~target_world = 1 & %varbit14887 = 1) {
227227
~pvp_icons_toggletargetsystem(false);
228228
} else {
229229
~pvp_icons_toggletargetsystem(true);

‎scripts/[proc,script15].cs2

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
11
// 15
22
[proc,script15](component $component0, int $int1, int $clock2)
3-
if (if_gethide(interface_90:50) = false) {
4-
if_settext("", $component0);
5-
return;
6-
}
7-
def_int $int3 = calc($int1 - (clientclock - $clock2) / 50);
8-
if ($int3 <= 0) {
9-
if_settext("Hurry!", $component0);
10-
return;
11-
}
12-
def_int $int4 = calc($int3 / 60);
13-
$int3 = calc($int3 % 60);
14-
if ($int3 >= 10) {
15-
if_settext("<tostring($int4)>:<tostring($int3)>", $component0);
16-
} else {
17-
if_settext("<tostring($int4)>:0<tostring($int3)>", $component0);
18-
}
3+
if_settext("", $component0);

‎scripts/[proc,script3148].cs2

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
// 3148
22
[proc,script3148](component $component0, component $component1, component $component2)
3-
def_int $int3 = scale(60, 100, calc((%varbit10543 - 2) * 2));
4-
~script3150($int3, $component1);
3+
def_int $int3 = calc(200 - %varbit14890);
4+
$int3 = interpolate(0, 60, 0, 100, $int3);
5+
def_int $int4 = 1;
6+
if (%varbit9495 = 0 | %varbit14888 = 0) {
7+
$int3 = scale(60, 100, calc((%varbit10543 - 2) * 2));
8+
$int4 = 0;
9+
}
10+
~script3150($int3, $component1, $component2, $int4);
511
if ($int3 > -2) {
612
if_sethide(false, $component2);
713
if_sethide(false, $component1);
8-
if_setontimer("script3149(calc(clientclock + 50), calc($int3 - 1), $component0, $component1, $component2)", $component0);
14+
if_setontimer("script3149(calc(clientclock + 50), calc($int3 - 1), $component0, $component1, $component2, $int4)", $component0);
915
} else {
1016
if_sethide(true, $component2);
1117
if_sethide(true, $component1);

0 commit comments

Comments
 (0)