Skip to content

Commit 7da6c1f

Browse files
hunterwbhunterwb
committed
199.1
1 parent 9a49f4b commit 7da6c1f

22 files changed

+151
-30
lines changed

‎README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@
389389
[**386**](scripts/[proc,pvp_icons_layout].cs2) `[proc,pvp_icons_layout]`
390390
[**387**](scripts/[proc,pvp_icons_comlevelrange].cs2) `[proc,pvp_icons_comlevelrange]`
391391
[**388**](scripts/[clientscript,pvp_icons_wildernesslevel].cs2) `[clientscript,pvp_icons_wildernesslevel]`
392+
[**389**](scripts/[proc,script389].cs2)
392393
[**390**](scripts/[clientscript,combat_wilderness_transmit].cs2) `[clientscript,combat_wilderness_transmit]`
393394
[**391**](scripts/[clientscript,poh_options_doors].cs2) `[clientscript,poh_options_doors]`
394395
[**392**](scripts/[clientscript,steelbox].cs2) `[clientscript,steelbox]`
@@ -3988,7 +3989,7 @@
39883989
[**3986**](scripts/[proc,settings_profanity_filter].cs2) `[proc,settings_profanity_filter]`
39893990
[**3987**](scripts/[clientscript,script3987].cs2)
39903991
[**3988**](scripts/[proc,script3988].cs2)
3991-
[**3989**](scripts/[proc,settings_store_button].cs2) `[proc,settings_store_button]`
3992+
[**3989**](scripts/[proc,script3989].cs2)
39923993
[**3990**](scripts/[proc,settings_mouse_camera].cs2) `[proc,settings_mouse_camera]`
39933994
[**3991**](scripts/[proc,script3991].cs2)
39943995
[**3992**](scripts/[proc,script3992].cs2)
@@ -5237,3 +5238,6 @@
52375238
[**5235**](scripts/[clientscript,script5235].cs2)
52385239
[**5236**](scripts/[clientscript,script5236].cs2)
52395240
[**5237**](scripts/[proc,script5237].cs2)
5241+
[**5238**](scripts/[proc,script5238].cs2)
5242+
[**5239**](scripts/[clientscript,script5239].cs2)
5243+
[**5240**](scripts/[clientscript,script5240].cs2)

‎scripts/[clientscript,orbs_update_store].cs2

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,36 @@
11
// 2396
22
[clientscript,orbs_update_store](component $component0, component $component1, component $component2, component $component3, component $component4)
3+
def_enum $enum5 = ~toplevel_getcomponents;
4+
if ($enum5 = null) {
5+
return;
6+
}
7+
def_graphic $graphic6 = "graphic_2138";
8+
def_graphic $graphic7 = "graphic_3517";
39
if ($component0 ! null) {
410
if_setnoclickthrough(true, $component2);
511
if_setnoclickthrough(true, $component1);
6-
if_setonvartransmit("orbs_update_store(null, $component1, $component2, $component3, $component4){var1055, var1795}", $component0);
12+
if_setonvartransmit("orbs_update_store(null, $component1, $component2, $component3, $component4){var1054, var1055, var1795}", $component0);
713
}
814
if (~show_storebutton = 1) {
915
if_sethide(false, $component1);
1016
if_sethide(false, $component2);
1117
if_sethide(false, $component3);
1218
if_sethide(false, $component4);
1319
if_setop(1, "Open Store", $component1);
20+
if_setgraphic($graphic6, $component2);
21+
if_setonmouserepeat("graphic_swapper($component2, $graphic7)", $component1);
22+
if_setonmouseleave("graphic_swapper($component2, $graphic6)", $component1);
1423
if (~bonds_hide = 1 & %varbit6713 = 0) {
1524
if_setop(2, "", $component1);
1625
} else {
1726
if_setop(2, "Bond Pouch", $component1);
1827
}
1928
if_setonop("opsound(event_opindex, 6)", $component1);
29+
if ($enum5 = enum_1129) {
30+
if_setposition(0, 83, ^setpos_abs_right, ^setpos_abs_top, interface_160:38);
31+
} else {
32+
if_setposition(85, 143, ^setpos_abs_left, ^setpos_abs_top, interface_160:38);
33+
}
2034
} else {
2135
if_sethide(true, $component1);
2236
if_sethide(true, $component2);

‎scripts/[clientscript,pvp_icons_layout_init].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
if_setontimer("pvp_icons_layout(false)", $component0);
1010
if_setonresize("pvp_icons_layout(true)", $component0);
1111
if_setonsubchange("pvp_icons_layout(true)", $component0);
12-
if_setonvartransmit("pvp_icons_layout(true){var1293, var1434, var1542, var1676, var1327, var1377, var1378, var1601, var1602, var2741, var1021, var1697, var2265, var2084}", $component0);
12+
if_setonvartransmit("pvp_icons_layout(true){var1293, var1434, var1542, var1676, var1327, var1377, var1378, var1601, var1602, var2741, var1021, var1697, var2265, var2084, var1709}", $component0);
1313
if_setonmouseleave("deltooltip(interface_90:54)", interface_90:46);
1414
cc_deleteall($component7);
1515
cc_create($component7, ^iftype_text, 0);

‎scripts/[clientscript,pvp_icons_wildernesslevel].cs2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
def_int $int1 = ~wilderness_level;
44
def_boolean $boolean2 = ~deadman_world;
55
if ($boolean2 = true) {
6-
if (%var1676 > 4) {
6+
if (%varbit1463 = 1) {
7+
if_settext("", $component0);
8+
} else if (%var1676 > 4) {
79
if ($int1 > 0 & %varbit5954 = 1) {
810
if_settext("Level: <tostring($int1)>", $component0);
911
} else {

‎scripts/[clientscript,script5239].cs2

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// 5239
2+
[clientscript,script5239]
3+
if_sethide(true, interface_50:63);
4+
if_sethide(true, interface_50:64);
5+
if_sethide(true, interface_50:65);
6+
if_sethide(true, interface_50:66);
7+
if_sethide(true, interface_50:67);
8+
if_sethide(true, interface_50:68);
9+
if_sethide(true, interface_50:69);
10+
if_sethide(true, interface_50:70);
11+
if_sethide(true, interface_50:71);
12+
if_sethide(true, interface_50:72);

‎scripts/[clientscript,script5240].cs2

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// 5240
2+
[clientscript,script5240]
3+
def_int $int0 = enum_getoutputcount(enum_1968);
4+
while ($int0 > 0) {
5+
$int0 = calc($int0 - 1);
6+
if_settext("", enum(int, component, enum_1968, $int0));
7+
}

‎scripts/[clientscript,tob_partydetails_addmember].cs2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ if (compare(lowercase($string1), lowercase(removetags(chat_playername))) = 0) {
1818
$colour1 = ^white;
1919
}
2020
def_int $int2 = calc(~max(0, %varcint178) * 11);
21-
def_int $y3 = calc(%varcint178 * 13);
21+
def_int $y3 = calc(%varcint178 * 13 + 1);
2222
cc_create(interface_50:27, ^iftype_rectangle, $int2);
2323
cc_setsize(0, 13, ^setsize_minus, ^setsize_abs);
2424
cc_setposition(0, $y3, ^setpos_abs_centre, ^setpos_abs_top);
@@ -51,4 +51,8 @@ $string0, $int5 = ~script2318(7, interface_50:38, $string0, $int2, $int5, $y3, $
5151
$string0, $int5 = ~script2318(8, interface_50:39, $string0, $int2, $int5, $y3, $colour1);
5252
$string0, $int5 = ~script2318(9, interface_50:40, $string0, $int2, $int5, $y3, $colour1);
5353
$string0, $int5 = ~script2318(10, interface_50:41, $string0, $int2, $int5, $y3, $colour1);
54+
if ($int0 = 2 & string_length($string1) > 0) {
55+
$int5 = ~script3989($string1, $int5, $y3);
56+
}
57+
if_sethide(false, interface_50:61);
5458
%varcint178 = calc(%varcint178 + 1);

‎scripts/[clientscript,tob_partylist_init].cs2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ cc_sethide(true);
3535
~script5219;
3636
if_setonvartransmit("tob_partylist_setpartybutton{var1740}", interface_364:66);
3737
if_setonvartransmit("script5218{var3052}", interface_364:67);
38+
if_sethide(true, interface_50:61);

‎scripts/[proc,deadman_spectator_stats].cs2

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ if_setsize(calc(247 - $int4), 6, ^setsize_abs, ^setsize_minus, enum(component, c
3434
def_component $component10 = enum(component, component, $enum9, interface_154:60);
3535
cc_deleteall($component10);
3636
def_int $int11 = 0;
37+
cc_create($component10, ^iftype_graphic, $int11);
38+
$int11 = calc($int11 + 1);
39+
cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
40+
cc_setsize(2, 2, ^setsize_minus, ^setsize_minus);
41+
cc_settiling(true);
42+
cc_setgraphic("tradebacking_dark");
3743
def_int $int12 = 8;
3844
def_int $int13 = 0;
3945
def_int $int14 = 0;
@@ -42,6 +48,7 @@ $int11, $int12, $int13, $int14 = ~script5226($int6, $component10, $enum9, $int11
4248
$int11, $int12, $int13, $int14 = ~script5226($int7, $component10, $enum9, $int11, $int12, $int13, $int14);
4349
if ($int13 <= 0) {
4450
if_sethide(true, $component10);
51+
cc_deleteall($component10);
4552
return;
4653
}
4754
if_sethide(false, $component10);

‎scripts/[proc,orbs_worldmap_setup].cs2

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def_graphic $graphic5 = null;
99
$graphic4, $graphic5 = ~orbs_worldmap_graphics;
1010
if ($enum3 = enum_1745) {
1111
if (%varbit6254 = 0) {
12-
if_setposition(0, 17, ^setpos_abs_right, ^setpos_abs_bottom, $component0);
12+
if_setposition(0, 115, ^setpos_abs_right, ^setpos_abs_top, $component0);
1313
} else {
1414
if_setposition(62, 37, ^setpos_abs_right, ^setpos_abs_top, $component0);
1515
}
@@ -19,16 +19,22 @@ if ($enum3 = enum_1745) {
1919
if_setsize(32, 32, ^setsize_abs, ^setsize_abs, $component2);
2020
} else if (~on_enhanced = 1 & $enum3 ! enum_1129) {
2121
if (%varbit12986 = 0) {
22-
if_setposition(0, 20, ^setpos_abs_right, ^setpos_abs_bottom, $component0);
22+
if_setposition(0, 115, ^setpos_abs_right, ^setpos_abs_top, $component0);
2323
} else {
2424
if_setposition(62, 37, ^setpos_abs_right, ^setpos_abs_top, $component0);
2525
}
2626
if_setsize(30, 30, ^setsize_abs, ^setsize_abs, $component0);
2727
if_setgraphic("ring_30", $component1);
2828
if_setsize(30, 30, ^setsize_abs, ^setsize_abs, $component1);
2929
if_setsize(22, 22, ^setsize_abs, ^setsize_abs, $component2);
30+
} else if ($enum3 = enum_1129) {
31+
if_setposition(10, 115, ^setpos_abs_right, ^setpos_abs_top, $component0);
32+
if_setsize(30, 30, ^setsize_abs, ^setsize_abs, $component0);
33+
if_setgraphic("ring_30", $component1);
34+
if_setsize(30, 30, ^setsize_abs, ^setsize_abs, $component1);
35+
if_setsize(22, 22, ^setsize_abs, ^setsize_abs, $component2);
3036
} else {
31-
if_setposition(0, 20, ^setpos_abs_right, ^setpos_abs_bottom, $component0);
37+
if_setposition(0, 115, ^setpos_abs_right, ^setpos_abs_top, $component0);
3238
if_setsize(30, 30, ^setsize_abs, ^setsize_abs, $component0);
3339
if_setgraphic("ring_30", $component1);
3440
if_setsize(30, 30, ^setsize_abs, ^setsize_abs, $component1);

‎scripts/[proc,pvp_icons_comlevelrange].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if (~deadman_world = true) {
88
if_sethide(true, interface_90:49);
99
return;
1010
}
11-
if (%varcint78 = 2) {
11+
if (%varcint78 = 2 | %varbit1463 = 1) {
1212
if_settext("", interface_90:49);
1313
return;
1414
}

‎scripts/[proc,pvp_icons_layout].cs2

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ if (~pvpw_check = 1) {
8282
if_sethide(true, interface_90:1);
8383
}
8484
if (~deadman_mode = 3) {
85-
if_setgraphic(enum(int, graphic, enum_4042, %varbit13017), interface_90:46);
85+
if (%varbit1463 = 1) {
86+
if_setgraphic(null, interface_90:46);
87+
} else {
88+
if_setgraphic(enum(int, graphic, enum_4042, %varbit13017), interface_90:46);
89+
}
8690
} else {
8791
if_setgraphic("pvpw_icons,0", interface_90:46);
8892
}

‎scripts/[proc,script389].cs2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 389
2+
[proc,script389]
3+
%varbit13037 = calc(1 - %varbit13037);

‎scripts/[proc,script3989].cs2

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// 3989
2+
[proc,script3989](string $string0, int $int0, int $y1)(int)
3+
def_component $component2 = null;
4+
def_component $component3 = null;
5+
switch_int (%varcint178) {
6+
case 0 :
7+
$component2 = interface_50:63;
8+
$component3 = interface_50:64;
9+
case 1 :
10+
$component2 = interface_50:65;
11+
$component3 = interface_50:66;
12+
case 2 :
13+
$component2 = interface_50:67;
14+
$component3 = interface_50:68;
15+
case 3 :
16+
$component2 = interface_50:69;
17+
$component3 = interface_50:70;
18+
case 4 :
19+
$component2 = interface_50:71;
20+
$component3 = interface_50:72;
21+
}
22+
$int0 = calc($int0 + 8);
23+
if (string_length($string0) > 0) {
24+
if (if_find($component2) = true) {
25+
if_sethide(false, $component2);
26+
if_setposition($int0, $y1, ^setpos_abs_left, ^setpos_abs_top, $component2);
27+
if_setsize(13, 13, ^setsize_abs, ^setsize_abs, $component2);
28+
$int0 = calc($int0 + if_getwidth($component2) + 8);
29+
} else {
30+
mes("couldn't find component");
31+
}
32+
if (if_find($component3) = true) {
33+
if_sethide(false, $component3);
34+
if_setposition($int0, $y1, ^setpos_abs_left, ^setpos_abs_top, $component3);
35+
if_setsize(13, 13, ^setsize_abs, ^setsize_abs, $component3);
36+
$int0 = calc($int0 + if_getwidth($component3));
37+
} else {
38+
mes("couldn't find component");
39+
}
40+
} else {
41+
if_sethide(true, $component2);
42+
if_sethide(true, $component3);
43+
}
44+
return($int0);

‎scripts/[proc,script5238].cs2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 5238
2+
[proc,script5238]
3+
%varbit13036 = calc(1 - %varbit13036);

‎scripts/[proc,settings_clicked_toggle].cs2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ switch_int ($int0) {
4747
case 46 :
4848
~script3988;
4949
case 47 :
50-
~settings_store_button;
50+
~script5238;
51+
case 181 :
52+
~script389;
5153
case 49 :
5254
~settings_mouse_camera;
5355
case 50 :

‎scripts/[proc,settings_get_toggle].cs2

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ switch_int ($int0) {
4646
case 46 :
4747
return(%varbit2570);
4848
case 47 :
49-
return(%varbit6506);
49+
return(%varbit13036);
50+
case 181 :
51+
return(%varbit13037);
5052
case 49 :
5153
return(%varbit4134);
5254
case 50 :

‎scripts/[proc,settings_store_button].cs2

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎scripts/[proc,show_storebutton].cs2

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
// 2414
22
[proc,show_storebutton]()(int)
3-
if (~on_mobile = false) {
4-
return(0);
5-
}
6-
if (%varbit6506 = 1) {
3+
if (~on_mobile = true) {
4+
if (%varbit13036 = 1) {
5+
return(1);
6+
}
7+
} else if (%varbit13037 = 1) {
78
return(1);
89
}
910
return(0);

‎scripts/[proc,skill_guide_data].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ switch_int ($int0) {
986986
case 62 :
987987
return(69, agility_climb_6517, "Arceuus essence mine northern scramble");
988988
case 63 :
989-
return(70, agility_contortion_6516, "Taverley Dungeon short-cuts to blue dragons");
989+
return(70, agility_contortion_6516, "Taverley Dungeon shortcuts to blue dragons");
990990
case 64 :
991991
return(70, agility_contortion_6516, "Fossil island hardwood shortcut");
992992
case 65 :

‎scripts/[proc,toplevel_resize_customise].cs2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ switch_enum ($enum1) {
1515
}
1616
if (%varbit4084 = 1) {
1717
_2122("resize_map_mask", enum(component, component, $enum1, interface_161:34));
18+
} else if (%varbit13037 = 1) {
19+
_2122("graphic_3513", enum(component, component, $enum1, interface_161:34));
1820
} else {
1921
_2122("resize_map_clickmask", enum(component, component, $enum1, interface_161:34));
2022
}
@@ -25,6 +27,8 @@ switch_enum ($enum1) {
2527
case enum_1130 :
2628
if (%varbit4084 = 1) {
2729
_2122("resize_map_mask", enum(component, component, $enum1, interface_161:34));
30+
} else if (%varbit13037 = 1) {
31+
_2122("graphic_3513", enum(component, component, $enum1, interface_161:34));
2832
} else {
2933
_2122("resize_map_clickmask", enum(component, component, $enum1, interface_161:34));
3034
}

‎scripts/[proc,wiki_icon_update].cs2

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
// 3306
22
[proc,wiki_icon_update](component $component0, component $component1, component $component2, boolean $boolean3)
3-
def_graphic $graphic4 = "wiki_icon,0";
4-
def_graphic $graphic5 = "wiki_icon,1";
3+
def_enum $enum4 = ~toplevel_getcomponents;
4+
if ($enum4 = null) {
5+
return;
6+
}
7+
def_graphic $graphic5 = "wiki_icon,0";
8+
def_graphic $graphic6 = "wiki_icon,1";
59
if (%varbit10113 = 0) {
610
if_sethide(false, $component1);
711
if (~on_mobile = false) {
8-
if_setonmouserepeat("graphic_swapper($component2, $graphic5)", $component1);
9-
if_setonmouseleave("graphic_swapper($component2, $graphic4)", $component1);
12+
if_setonmouserepeat("graphic_swapper($component2, $graphic6)", $component1);
13+
if_setonmouseleave("graphic_swapper($component2, $graphic5)", $component1);
1014
if_setsize(40, 24, ^setsize_abs, ^setsize_abs, $component1);
1115
} else {
1216
if_setsize(40, 34, ^setsize_abs, ^setsize_abs, $component1);
1317
}
14-
if ($boolean3 = false) {
15-
if (~show_storebutton = 0) {
16-
if_setposition(62, 75, ^setpos_abs_right, ^setpos_abs_top, $component0);
17-
} else {
18-
if_setposition(8, 101, ^setpos_abs_right, ^setpos_abs_top, $component0);
19-
}
18+
if ($boolean3 = false & ~show_storebutton = 0) {
19+
if_setposition(62, 75, ^setpos_abs_right, ^setpos_abs_top, $component0);
20+
} else if ($enum4 = enum_1129) {
21+
if_setposition(8, 135, ^setpos_abs_right, ^setpos_abs_top, $component0);
22+
} else {
23+
if_setposition(0, 135, ^setpos_abs_right, ^setpos_abs_top, $component0);
2024
}
2125
} else {
2226
if_sethide(true, $component1);

0 commit comments

Comments
 (0)