Skip to content

Commit 7d22756

Browse files
hunterwbhunterwb
committed
193.1
1 parent 120c31c commit 7d22756

File tree

74 files changed

+1721
-314
lines changed

Some content is hidden

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

74 files changed

+1721
-314
lines changed

‎README.md

+46-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@
377377
[**374**](scripts/[proc,script374].cs2)
378378
[**375**](scripts/[proc,script375].cs2)
379379
[**376**](scripts/[clientscript,script376].cs2)
380-
[**377**](scripts/[proc,script377].cs2)
380+
[**377**](scripts/[clientscript,script377].cs2)
381381
[**378**](scripts/[proc,script378].cs2)
382382
[**379**](scripts/[proc,script379].cs2)
383383
[**380**](scripts/[clientscript,script380].cs2)
@@ -531,6 +531,14 @@
531531
[**528**](scripts/[clientscript,script528].cs2)
532532
[**529**](scripts/[clientscript,script529].cs2)
533533
[**530**](scripts/[proc,script530].cs2)
534+
[**531**](scripts/[proc,script531].cs2)
535+
[**532**](scripts/[clientscript,script532].cs2)
536+
[**533**](scripts/[proc,script533].cs2)
537+
[**534**](scripts/[clientscript,script534].cs2)
538+
[**535**](scripts/[clientscript,script535].cs2)
539+
[**536**](scripts/[proc,script536].cs2)
540+
[**537**](scripts/[proc,script537].cs2)
541+
[**538**](scripts/[proc,script538].cs2)
534542
[**539**](scripts/[proc,options_setfps].cs2) `[proc,options_setfps]`
535543
[**540**](scripts/[clientscript,ge_offers_bigbutton_init].cs2) `[clientscript,ge_offers_bigbutton_init]`
536544
[**541**](scripts/[proc,ge_offers_bigbutton].cs2) `[proc,ge_offers_bigbutton]`
@@ -567,6 +575,7 @@
567575
[**572**](scripts/[proc,script572].cs2)
568576
[**573**](scripts/[proc,script573].cs2)
569577
[**574**](scripts/[proc,gnomeball_score].cs2) `[proc,gnomeball_score]`
578+
[**575**](scripts/[proc,script575].cs2)
570579
[**576**](scripts/[clientscript,clanwars_setup_scrollbox_init].cs2) `[clientscript,clanwars_setup_scrollbox_init]`
571580
[**577**](scripts/[proc,clanwars_setup_scrollbox_drawframe].cs2) `[proc,clanwars_setup_scrollbox_drawframe]`
572581
[**578**](scripts/[clientscript,clanwars_setup_smallbox_init].cs2) `[clientscript,clanwars_setup_smallbox_init]`
@@ -665,6 +674,9 @@
665674
[**671**](scripts/[proc,rune_pouch_drawinventory_slot].cs2) `[proc,rune_pouch_drawinventory_slot]`
666675
[**672**](scripts/[clientscript,rune_pouch_inventoryreorder].cs2) `[clientscript,rune_pouch_inventoryreorder]`
667676
[**673**](scripts/[proc,add].cs2) `[proc,add]`
677+
[**674**](scripts/[clientscript,script674].cs2)
678+
[**675**](scripts/[proc,script675].cs2)
679+
[**676**](scripts/[clientscript,script676].cs2)
668680
[**677**](scripts/[proc,meslayer_open].cs2) `[proc,meslayer_open]`
669681
[**678**](scripts/[proc,meslayer_dynamicbutton].cs2) `[proc,meslayer_dynamicbutton]`
670682
[**679**](scripts/[proc,bankpin_button_setup].cs2) `[proc,bankpin_button_setup]`
@@ -830,6 +842,24 @@
830842
[**839**](scripts/[clientscript,bankmain_size_check].cs2) `[clientscript,bankmain_size_check]`
831843
[**840**](scripts/[proc,bankmain_size_check].cs2) `[proc,bankmain_size_check]`
832844
[**841**](scripts/[clientscript,worldswitcher_loading].cs2) `[clientscript,worldswitcher_loading]`
845+
[**842**](scripts/[proc,script842].cs2)
846+
[**843**](scripts/[proc,script843].cs2)
847+
[**844**](scripts/[proc,script844].cs2)
848+
[**845**](scripts/[clientscript,script845].cs2)
849+
[**846**](scripts/[clientscript,script846].cs2)
850+
[**847**](scripts/[proc,script847].cs2)
851+
[**848**](scripts/[clientscript,script848].cs2)
852+
[**849**](scripts/[proc,script849].cs2)
853+
[**850**](scripts/[clientscript,script850].cs2)
854+
[**851**](scripts/[clientscript,script851].cs2)
855+
[**852**](scripts/[proc,script852].cs2)
856+
[**853**](scripts/[proc,script853].cs2)
857+
[**854**](scripts/[proc,script854].cs2)
858+
[**855**](scripts/[clientscript,script855].cs2)
859+
[**856**](scripts/[proc,script856].cs2)
860+
[**857**](scripts/[proc,script857].cs2)
861+
[**858**](scripts/[proc,script858].cs2)
862+
[**859**](scripts/[proc,script859].cs2)
833863
[**860**](scripts/[clientscript,mes].cs2) `[clientscript,mes]`
834864
[**861**](scripts/[clientscript,script861].cs2)
835865
[**862**](scripts/[clientscript,script862].cs2)
@@ -853,7 +883,10 @@
853883
[**880**](scripts/[clientscript,boardgames_rank_runeversi].cs2) `[clientscript,boardgames_rank_runeversi]`
854884
[**881**](scripts/[clientscript,boardgames_rank_runesquares].cs2) `[clientscript,boardgames_rank_runesquares]`
855885
[**882**](scripts/[clientscript,gnomeball_score].cs2) `[clientscript,gnomeball_score]`
886+
[**883**](scripts/[clientscript,script883].cs2)
856887
[**884**](scripts/[clientscript,castlewars_hud_init].cs2) `[clientscript,castlewars_hud_init]`
888+
[**885**](scripts/[clientscript,script885].cs2)
889+
[**886**](scripts/[clientscript,script886].cs2)
857890
[**887**](scripts/[clientscript,castlewars_overlay_saradomin].cs2) `[clientscript,castlewars_overlay_saradomin]`
858891
[**888**](scripts/[clientscript,castlewars_overlay_zamorak].cs2) `[clientscript,castlewars_overlay_zamorak]`
859892
[**889**](scripts/[clientscript,ii_impling_count].cs2) `[clientscript,ii_impling_count]`
@@ -1074,6 +1107,11 @@
10741107
[**1104**](scripts/[clientscript,snapshot_init].cs2) `[clientscript,snapshot_init]`
10751108
[**1105**](scripts/[clientscript,skill_guide_sidepanelop].cs2) `[clientscript,skill_guide_sidepanelop]`
10761109
[**1106**](scripts/[proc,abyssalsire_overseer_update].cs2) `[proc,abyssalsire_overseer_update]`
1110+
[**1107**](scripts/[proc,script1107].cs2)
1111+
[**1108**](scripts/[clientscript,script1108].cs2)
1112+
[**1109**](scripts/[proc,script1109].cs2)
1113+
[**1110**](scripts/[clientscript,script1110].cs2)
1114+
[**1111**](scripts/[proc,script1111].cs2)
10771115
[**1112**](scripts/[clientscript,farming_view_init].cs2) `[clientscript,farming_view_init]`
10781116
[**1113**](scripts/[proc,farming_view_createtab].cs2) `[proc,farming_view_createtab]`
10791117
[**1114**](scripts/[clientscript,farming_view_optab].cs2) `[clientscript,farming_view_optab]`
@@ -1086,6 +1124,13 @@
10861124
[**1121**](scripts/[proc,snapshot_rules_write].cs2) `[proc,snapshot_rules_write]`
10871125
[**1122**](scripts/[clientscript,snapshot_rules_hover].cs2) `[clientscript,snapshot_rules_hover]`
10881126
[**1123**](scripts/[clientscript,snapshot_rules_send].cs2) `[clientscript,snapshot_rules_send]`
1127+
[**1124**](scripts/[proc,script1124].cs2)
1128+
[**1125**](scripts/[proc,script1125].cs2)
1129+
[**1126**](scripts/[proc,script1126].cs2)
1130+
[**1127**](scripts/[proc,script1127].cs2)
1131+
[**1128**](scripts/[clientscript,script1128].cs2)
1132+
[**1129**](scripts/[proc,script1129].cs2)
1133+
[**1130**](scripts/[clientscript,script1130].cs2)
10891134
[**1132**](scripts/[clientscript,script1132].cs2)
10901135
[**1133**](scripts/[clientscript,script1133].cs2)
10911136
[**1134**](scripts/[clientscript,script1134].cs2)

‎scripts/[clientscript,chat_broadcast_op].cs2

+22-4
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,36 @@
22
[clientscript,chat_broadcast_op](int $opindex0, string $string0, int $int1)
33
def_int $mesuid2 = -1;
44
def_boolean $boolean3 = false;
5+
def_enum $enum4 = null;
6+
def_component $component5 = null;
57
if ($opindex0 = 9) {
68
%varcint202 = clientclock;
79
$mesuid2 = ~script553;
810
~rebuildchatbox($mesuid2);
911
~rebuildpmbox($mesuid2);
1012
} else if (string_length($string0) > 0) {
11-
$boolean3 = enum(int, boolean, enum_2761, $int1);
12-
if (clienttype ! ^clienttype_ios) {
13-
$boolean3 = false;
13+
if (clienttype = ^clienttype_ios) {
14+
$boolean3 = enum(int, boolean, enum_2761, $int1);
1415
}
1516
if ($boolean3 = false) {
16-
if ($opindex0 = 6) {
17+
if ($int1 = 25) {
18+
if ($opindex0 = 6) {
19+
$enum4 = ~toplevel_getcomponents;
20+
if ($enum4 ! null) {
21+
$component5 = enum(int, component, enum_1137, 8);
22+
$component5 = enum(component, component, $enum4, $component5);
23+
if ($component5 ! null & if_hassub($component5) = true) {
24+
_2928(interface_109:54, -1, 1);
25+
} else {
26+
mes("You can't open the poll menu at the moment.");
27+
}
28+
} else {
29+
mes("You can't open the poll menu at the moment.");
30+
}
31+
} else {
32+
mes("This link attempts to open the poll menu.");
33+
}
34+
} else if ($opindex0 = 6) {
1735
~openurl_raw($string0, true, true);
1836
} else {
1937
mes("Link destination: <col=ef1020><$string0></col>");

‎scripts/[clientscript,league_reward_confirm_back].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
sound_synth(synth_2266, 1, 0);
44
if_sethide(true, $component7);
55
%varbit10110 = -1;
6-
~league_rewards_draw($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12);
6+
~league_rewards_draw($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, if_getscrolly($component4));

‎scripts/[clientscript,league_reward_shop_buy].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ if ($opindex0 ! 1) {
55
}
66
sound_synth(synth_2266, 1, 0);
77
if_sethide(true, $component7);
8-
~league_rewards_draw(-1, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12);
8+
~league_rewards_draw(-1, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, if_getscrolly($component4));

‎scripts/[clientscript,league_reward_shop_refuse].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
[clientscript,league_reward_shop_refuse](string $mes0, component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, component $component11, struct $struct12)
33
sound_synth(pillory_wrong, 1, 0);
44
mes($mes0);
5-
~league_rewards_draw(-1, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11);
5+
~league_rewards_draw(-1, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, if_getscrolly($component3));

‎scripts/[clientscript,league_reward_shop_select].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ if (~script3292($struct13) = 0) {
44
return;
55
}
66
sound_synth(synth_2266, 1, 0);
7-
~league_rewards_draw($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12);
7+
~league_rewards_draw($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, if_getscrolly($component4));

‎scripts/[clientscript,league_rewards_init].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
[clientscript,league_rewards_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)
33
~league_reward_shop_showpoints($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11);
44
if_setonvartransmit("league_reward_shop_showpoints($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11){var2613}", $component1);
5-
~league_rewards_draw(-1, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11);
5+
~league_rewards_draw(-1, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, 0);

‎scripts/[clientscript,poh_add_room_init].cs2

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[clientscript,poh_add_room_init](component $component0, component $component1)
33
cc_deleteall($component0);
44
def_int $int2 = 0;
5-
while ($int2 <= 28) {
5+
while ($int2 <= 29) {
66
cc_create($component0, ^iftype_rectangle, $int2);
77
cc_sethide(true);
88
$int2 = calc($int2 + 1);
@@ -15,6 +15,7 @@ $height3 = ~poh_add_room_initbutton($height3, 4, "Dining room", 10);
1515
$height3 = ~poh_add_room_initbutton($height3, 12, "Workshop", 15);
1616
$height3 = ~poh_add_room_initbutton($height3, 5, "Bedroom", 20);
1717
$height3 = ~poh_add_room_initbutton($height3, 7, "Hall - Skill trophies", 25);
18+
$height3 = ~poh_add_room_initbutton($height3, 29, "League Hall", 27);
1819
$height3 = ~poh_add_room_initbutton($height3, 6, "Games room", 30);
1920
$height3 = ~poh_add_room_initbutton($height3, 22, "Combat room", 32);
2021
$height3 = ~poh_add_room_initbutton($height3, 9, "Hall - Quest trophies", 35);

‎scripts/[clientscript,poh_menagerie_petlist].cs2

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ def_int $int0 = 0;
66
def_int $int1 = calc((40 - 32) / 2);
77
def_int $int2 = 0;
88
def_namedobj $namedobj3 = null;
9-
while ($int2 <= 45) {
9+
while ($int2 <= 46) {
1010
cc_create(interface_210:3, ^iftype_graphic, $int0);
1111
$int0 = calc($int0 + 1);
1212
cc_setsize(36, 32, ^setsize_abs, ^setsize_abs);
@@ -25,7 +25,7 @@ def_string $text1 = "";
2525
def_int $width4 = if_getwidth(interface_210:3);
2626
def_int $width5 = calc($width4 - (36 + 10));
2727
$int2 = 0;
28-
while ($int2 <= 45) {
28+
while ($int2 <= 46) {
2929
cc_create(interface_210:3, ^iftype_text, $int0);
3030
$int0 = calc($int0 + 1);
3131
cc_setsize($width5, 40, ^setsize_abs, ^setsize_abs);
@@ -36,7 +36,7 @@ while ($int2 <= 45) {
3636
cc_settextfont(p12_full);
3737
$text1, $string0 = ~script632($string0);
3838
cc_settext($text1);
39-
if ($int2 < 45) {
39+
if ($int2 < 46) {
4040
cc_create(interface_210:3, ^iftype_graphic, $int0);
4141
$int0 = calc($int0 + 1);
4242
cc_setgraphic("tradebacking");
@@ -46,7 +46,7 @@ while ($int2 <= 45) {
4646
}
4747
$int2 = calc($int2 + 1);
4848
}
49-
def_int $height6 = calc(40 * (45 + 1));
49+
def_int $height6 = calc(40 * (46 + 1));
5050
if ($height6 > if_getheight(interface_210:3)) {
5151
if_setscrollsize(0, $height6, interface_210:3);
5252
} else {

‎scripts/[clientscript,poh_viewer_setroom].cs2

+30-13
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,24 @@ if (testbit($flags4, 21) = ^true) {
186186
if (testbit($flags4, 22) = ^true) {
187187
$int18 = setbit($int18, 4);
188188
}
189-
def_obj $obj19 = enum(int, obj, enum_250, $int10);
190-
if_setopbase("<col=ff9040><oc_name($obj19)></col>", $component5);
189+
def_int $int19 = 0;
190+
if (testbit($flags4, 23) = ^true) {
191+
$int19 = setbit($int19, 0);
192+
}
193+
if (testbit($flags4, 24) = ^true) {
194+
$int19 = setbit($int19, 1);
195+
}
196+
if (testbit($flags4, 25) = ^true) {
197+
$int19 = setbit($int19, 2);
198+
}
199+
if (testbit($flags4, 26) = ^true) {
200+
$int19 = setbit($int19, 3);
201+
}
202+
if (testbit($flags4, 27) = ^true) {
203+
$int19 = setbit($int19, 4);
204+
}
205+
def_obj $obj20 = enum(int, obj, enum_250, $int10);
206+
if_setopbase("<col=ff9040><oc_name($obj20)></col>", $component5);
191207
~script1385($int0, $int6, $int8, $int7);
192208
cc_deleteall($component5);
193209
cc_create($component5, ^iftype_graphic, 0);
@@ -202,17 +218,18 @@ cc_setgraphic("tradebacking_light");
202218
cc_settiling(true);
203219
cc_settrans(75);
204220
cc_sethide(true);
205-
def_string $string0 = "<oc_name($obj19)>:";
206-
def_int $int20 = 0;
207-
$string0, $int20 = ~poh_viewer_roomtooltip($string0, $int11, enum_1425, $enum1, $int20);
208-
$string0, $int20 = ~poh_viewer_roomtooltip($string0, $int12, enum_1426, $enum1, $int20);
209-
$string0, $int20 = ~poh_viewer_roomtooltip($string0, $int13, enum_1427, $enum1, $int20);
210-
$string0, $int20 = ~poh_viewer_roomtooltip($string0, $int14, enum_1428, $enum1, $int20);
211-
$string0, $int20 = ~poh_viewer_roomtooltip($string0, $int15, enum_1429, $enum1, $int20);
212-
$string0, $int20 = ~poh_viewer_roomtooltip($string0, $int16, enum_1430, $enum1, $int20);
213-
$string0, $int20 = ~poh_viewer_roomtooltip($string0, $int17, enum_1431, $enum1, $int20);
214-
$string0, $int20 = ~poh_viewer_roomtooltip($string0, $int18, enum_1432, $enum1, $int20);
215-
if ($int20 > 0) {
221+
def_string $string0 = "<oc_name($obj20)>:";
222+
def_int $int21 = 0;
223+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int11, enum_1425, $enum1, $int21);
224+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int12, enum_1426, $enum1, $int21);
225+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int13, enum_1427, $enum1, $int21);
226+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int14, enum_1428, $enum1, $int21);
227+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int15, enum_1429, $enum1, $int21);
228+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int16, enum_1430, $enum1, $int21);
229+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int17, enum_1431, $enum1, $int21);
230+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int18, enum_1432, $enum1, $int21);
231+
$string0, $int21 = ~poh_viewer_roomtooltip($string0, $int19, enum_3560, $enum1, $int21);
232+
if ($int21 > 0) {
216233
$string0 = append($string0, "</col>");
217234
} else {
218235
$string0 = append($string0, " <col=4f4f4f>(empty)</col>");

‎scripts/[clientscript,script1108].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 1108
2+
[clientscript,script1108](int $int0, int $int1, component $component2, int $int3, component $component4, int $colour5)
3+
~script1107($int0, $int1, $component2, $int3, $component4, $colour5);

‎scripts/[clientscript,script1110].cs2

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// 1110
2+
[clientscript,script1110](component $component0, component $component1, component $component2, component $component3, int $int4, int $int5, string $string0)
3+
~leagues_close_button($component3, false);
4+
if_setposition(50, 5, ^setpos_abs_right, ^setpos_abs_top, $component3);
5+
~script1111($component0, $component1, $component2, $string0, $int4, $int5);

0 commit comments

Comments
 (0)