Skip to content

Commit 12086db

Browse files
hunterwbhunterwb
committed
195.2
1 parent b439a4b commit 12086db

File tree

74 files changed

+883
-257
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

+883
-257
lines changed

‎README.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4116,3 +4116,26 @@
41164116
[**4113**](scripts/[clientscript,camdozaal_timer_pause].cs2) `[clientscript,camdozaal_timer_pause]`
41174117
[**4114**](scripts/[clientscript,camdozaal_timer].cs2) `[clientscript,camdozaal_timer]`
41184118
[**4115**](scripts/[proc,camdozaal_timer_text].cs2) `[proc,camdozaal_timer_text]`
4119+
[**4116**](scripts/[clientscript,script4116].cs2)
4120+
[**4117**](scripts/[clientscript,script4117].cs2)
4121+
[**4118**](scripts/[clientscript,script4118].cs2)
4122+
[**4119**](scripts/[proc,script4119].cs2)
4123+
[**4120**](scripts/[clientscript,script4120].cs2)
4124+
[**4121**](scripts/[clientscript,script4121].cs2)
4125+
[**4122**](scripts/[proc,script4122].cs2)
4126+
[**4123**](scripts/[clientscript,script4123].cs2)
4127+
[**4124**](scripts/[proc,script4124].cs2)
4128+
[**4125**](scripts/[clientscript,script4125].cs2)
4129+
[**4126**](scripts/[clientscript,script4126].cs2)
4130+
[**4127**](scripts/[proc,script4127].cs2)
4131+
[**4128**](scripts/[proc,script4128].cs2)
4132+
[**4129**](scripts/[proc,script4129].cs2)
4133+
[**4130**](scripts/[proc,script4130].cs2)
4134+
[**4131**](scripts/[proc,script4131].cs2)
4135+
[**4132**](scripts/[proc,script4132].cs2)
4136+
[**4133**](scripts/[proc,script4133].cs2)
4137+
[**4134**](scripts/[proc,script4134].cs2)
4138+
[**4135**](scripts/[proc,script4135].cs2)
4139+
[**4136**](scripts/[proc,script4136].cs2)
4140+
[**4137**](scripts/[proc,script4137].cs2)
4141+
[**4138**](scripts/[proc,script4138].cs2)

‎scripts/[clientscript,camdozaal_ramarno_shop_setup].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 4107
22
[clientscript,camdozaal_ramarno_shop_setup]
3-
if_settext("<col=ff981f>Total Barronite Shards:</col><col=ffffff> <tostring(calc(inv_total(inv, barronite_shards_25676) + %var2953))></col>", interface_685:2);
3+
if_settext("<col=ff981f>Total Barronite Shards:</col><col=ffffff> <~tostring_spacer(%var2953, ",")></col>", interface_685:2);
44
~camdozaal_ramarno_shop_setup_button(struct_2879, %varbit12099, interface_685:3, interface_685:14);
55
~camdozaal_ramarno_shop_setup_button(struct_2880, %varbit12100, interface_685:4, interface_685:5);
66
~camdozaal_ramarno_shop_setup_button(struct_2881, %varbit12101, interface_685:6, interface_685:7);

‎scripts/[clientscript,magic_spellbook_init].cs2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ if ($boolean12 = true) {
2424
~magic_spellbook_initialisespells(enum_1984, $component10, $boolean12);
2525
~magic_spellbook_initialisespells(enum_1985, $component10, $boolean12);
2626
~magic_spellbook_redraw($component2, $component3, $component10, $component1, $component7, $component8, $component9, $component4, $component5, $component6, $string0, $string1, $boolean12);
27-
if_setonvartransmit("magic_spellbook_redraw($component2, $component3, $component10, $component1, $component7, $component8, $component9, $component4, $component5, $component6, $string0, $string1, $boolean12){var638, var375, var1139, var1140, var1141, var439, var318, var635, var1377, var1339, var1429, var1632, var1047, var1105}", $component0);
27+
~script4137($component0, interface_399:6, interface_399:7, interface_399:8);
2828
if_setoninvtransmit("magic_spellbook_redraw($component2, $component3, $component10, $component1, $component7, $component8, $component9, $component4, $component5, $component6, $string0, $string1, $boolean12){inv}", $component0);
29-
if_setonstattransmit("magic_spellbook_redraw($component2, $component3, $component10, $component1, $component7, $component8, $component9, $component4, $component5, $component6, $string0, $string1, $boolean12){magic}", $component0);
29+
if_setonstattransmit("magic_spellbook_redraw($component2, $component3, $component10, $component1, $component7, $component8, $component9, $component4, $component5, $component6, $string0, $string1, $boolean12){magic, prayer}", $component0);

‎scripts/[clientscript,pvp_icons_layout_init].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
if_setontimer("pvp_icons_layout(false)", $component0);
1313
if_setonresize("pvp_icons_layout(true)", $component0);
1414
if_setonsubchange("pvp_icons_layout(true)", $component0);
15-
if_setonvartransmit("pvp_icons_layout(true){var1293, var1434, var1542, var1676, var1327, var1377, var1378, var1601, var1602, var2741}", $component0);
15+
if_setonvartransmit("pvp_icons_layout(true){var1293, var1434, var1542, var1676, var1327, var1377, var1378, var1601, var1602, var2741, var1021}", $component0);
1616
if_setonmouseleave("deltooltip(interface_90:56)", interface_90:49);
1717
cc_deleteall($component11);
1818
cc_create($component11, ^iftype_text, 0);

‎scripts/[clientscript,raids_sidepanel_addline].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 1548
22
[clientscript,raids_sidepanel_addline](int $int0, string $string0)
3-
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:73)) = false) {
3+
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:74)) = false) {
44
return;
55
}
66
if (string_length($string0) <= 0) {

‎scripts/[clientscript,raids_sidepanel_initlines].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 1547
22
[clientscript,raids_sidepanel_initlines](int $int0)
3-
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:73)) = false) {
3+
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:74)) = false) {
44
return;
55
}
66
cc_deleteall(interface_500:10);

‎scripts/[clientscript,script1553].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 1553
22
[clientscript,script1553](int $int0)
3-
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:73)) = false) {
3+
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:74)) = false) {
44
return;
55
}
66
if_sethide(false, interface_500:10);

‎scripts/[clientscript,script3145].cs2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
[clientscript,script3145](boolean $boolean0)
33
if ($boolean0 = null) {
44
setremoveroofs(%varcint402);
5+
%varcint434 = 0;
6+
return;
7+
}
8+
if (%varcint434 = 1) {
59
return;
610
}
711
%varcint402 = getremoveroofs;
812
setremoveroofs($boolean0);
13+
%varcint434 = 1;

‎scripts/[clientscript,script3643].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ while ($size1 < $size2) {
1010
cc_setoutline(1);
1111
cc_setdragdeadzone(5);
1212
cc_setdragdeadtime(5);
13-
cc_settrans(0);
1413
cc_sethide(false);
1514
$size1 = calc($size1 + 1);
1615
}
1716
~script3645($component0, $size2);
1817
if_setoninvtransmit("script3644($component0, $size2){inv}", $component0);
18+
if_setonvartransmit("script3644($component0, $size2){var1432}", $component0);

‎scripts/[clientscript,script4116].cs2

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// 4116
2+
[clientscript,script4116](component $component0, component $component1, component $component2)
3+
~script2249($component1, setbit(setbit(0, 3), 4));
4+
~script1486($component2, ^setpos_abs_left, 1, 0);
5+
~script1490($component0);

‎scripts/[clientscript,script4117].cs2

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// 4117
2+
[clientscript,script4117](component $component0, component $component1, component $component2, component $component3, component $component4)
3+
~script4119($component1, $component2, $component3, $component4);
4+
if (~on_mobile = false) {
5+
if_setonmouseover("script4120($component1)", $component1);
6+
if_setonmouseleave("script4121($component1)", $component1);
7+
if_setonmouseover("script4120($component2)", $component2);
8+
if_setonmouseleave("script4121($component2)", $component2);
9+
if_setonmouseover("script4120($component3)", $component3);
10+
if_setonmouseleave("script4121($component3)", $component3);
11+
if_setonmouseover("script4120($component4)", $component4);
12+
if_setonmouseleave("script4121($component4)", $component4);
13+
}
14+
if_setoninvtransmit("script4118($component1, $component2, $component3, $component4){inv}", $component0);

‎scripts/[clientscript,script4118].cs2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 4118
2+
[clientscript,script4118](component $component0, component $component1, component $component2, component $component3)
3+
~script4119($component0, $component1, $component2, $component3);

‎scripts/[clientscript,script4120].cs2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 4120
2+
[clientscript,script4120](component $component0)
3+
if_setmodelangle(0, 0, 500, 0, 0, 846, $component0);

‎scripts/[clientscript,script4121].cs2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 4121
2+
[clientscript,script4121](component $component0)
3+
if_setmodelangle(0, 0, 500, 0, 0, 1046, $component0);

‎scripts/[clientscript,script4123].cs2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 4123
2+
[clientscript,script4123](int $int0, component $component1, component $component2, component $component3, enum $enum4, int $int5, component $component6, component $component7)
3+
~soul_wars_rewards_drawconfirm($int0, $component1, $component2, $component3, $enum4, $int5, $component6, $component7);

‎scripts/[clientscript,script4125].cs2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// 4125
2+
[clientscript,script4125](component $component0)
3+
if_setonvartransmit("script4126($component0){var1795}", $component0);
4+
~script4127($component0);

‎scripts/[clientscript,script4126].cs2

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 4126
2+
[clientscript,script4126](component $component0)
3+
~script4127($component0);

‎scripts/[clientscript,soul_wars_rewards_select].cs2

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,16 @@ sound_synth(synth_2266, 1, 0);
77
def_int $y8 = 0;
88
if ($int4 = 1 | $int4 = 2) {
99
$y8 = if_getscrolly($component1);
10+
} else {
11+
switch_int (calc($int0 % 4)) {
12+
case 0 :
13+
%var2971 = 1;
14+
case 1 :
15+
%var2971 = 10;
16+
case 2 :
17+
%var2971 = 100;
18+
case 3 :
19+
%var2971 = 0;
20+
}
1021
}
1122
~soul_wars_rewards_select($int0, $component1, $component2, $component3, $int4, $y8, $component6, $component7);

‎scripts/[proc,autocast_setup].cs2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def_int $int2 = 1;
1616
def_int $x3 = -1;
1717
def_int $y4 = -1;
1818
def_obj $obj5 = null;
19-
while ($int2 <= 52) {
19+
while ($int2 <= 58) {
2020
cc_create($component0, ^iftype_graphic, $int2);
2121
$x3, $y4, $obj5 = ~autocast_spellpos($int2, %var664), enum(int, obj, enum_1986, $int2);
2222
if ($x3 ! -1 & $y4 ! -1 & $obj5 ! null) {

‎scripts/[proc,autocast_spellpos].cs2

Lines changed: 116 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ switch_int ($int1) {
4545
return(60, 61);
4646
}
4747
case 4170 :
48+
if (%varbit4070 = 3) {
49+
return(~script4133($int0));
50+
}
4851
switch_int ($int0) {
4952
case 17 :
5053
return(-33, -52);
@@ -135,7 +138,69 @@ switch_int ($int1) {
135138
case 47 :
136139
return(-60, 64);
137140
}
138-
case 11791, 22296, 24144 :
141+
case 22296, 24144 :
142+
switch_int ($int0) {
143+
case 1 :
144+
return(-60, -66);
145+
case 2 :
146+
return(-20, -66);
147+
case 3 :
148+
return(20, -66);
149+
case 4 :
150+
return(60, -66);
151+
case 5 :
152+
return(-60, -40);
153+
case 6 :
154+
return(-20, -40);
155+
case 7 :
156+
return(20, -40);
157+
case 8 :
158+
return(60, -40);
159+
case 9 :
160+
return(-60, -14);
161+
case 10 :
162+
return(-20, -14);
163+
case 11 :
164+
return(20, -14);
165+
case 12 :
166+
return(60, -14);
167+
case 13 :
168+
return(-60, 13);
169+
case 14 :
170+
return(-20, 13);
171+
case 15 :
172+
return(20, 13);
173+
case 16 :
174+
return(60, 13);
175+
case 48 :
176+
return(-60, 39);
177+
case 49 :
178+
return(-20, 39);
179+
case 50 :
180+
return(20, 39);
181+
case 51 :
182+
return(60, 39);
183+
case 17 :
184+
return(-60, 64);
185+
case 18 :
186+
return(-20, 64);
187+
case 20 :
188+
if ($int1 = 11791) {
189+
return(20, 64);
190+
}
191+
case 52 :
192+
if ($int1 = 22296) {
193+
return(20, 64);
194+
}
195+
case 19 :
196+
if ($int1 = 24144) {
197+
return(20, 64);
198+
}
199+
}
200+
case 11791 :
201+
if (%varbit4070 = 3) {
202+
return(~script4133($int0));
203+
}
139204
switch_int ($int0) {
140205
case 1 :
141206
return(-60, -66);
@@ -229,5 +294,55 @@ switch_int ($int1) {
229294
case 46 :
230295
return(60, 60);
231296
}
297+
case 21006 :
298+
return(~script4133($int0));
299+
case 4710 :
300+
if (%varbit4070 = 3) {
301+
return(~script4133($int0));
302+
}
303+
switch_int ($int0) {
304+
case 1 :
305+
return(-60, -62);
306+
case 2 :
307+
return(-20, -62);
308+
case 3 :
309+
return(20, -62);
310+
case 4 :
311+
return(60, -62);
312+
case 5 :
313+
return(-60, -31);
314+
case 6 :
315+
return(-20, -31);
316+
case 7 :
317+
return(20, -31);
318+
case 8 :
319+
return(60, -31);
320+
case 9 :
321+
return(-60, 0);
322+
case 10 :
323+
return(-20, 0);
324+
case 11 :
325+
return(20, 0);
326+
case 12 :
327+
return(60, 0);
328+
case 13 :
329+
return(-60, 31);
330+
case 14 :
331+
return(-20, 31);
332+
case 15 :
333+
return(20, 31);
334+
case 16 :
335+
return(60, 31);
336+
case 48 :
337+
return(-60, 61);
338+
case 49 :
339+
return(-20, 61);
340+
case 50 :
341+
return(20, 61);
342+
case 51 :
343+
return(60, 61);
344+
}
345+
case 9013 :
346+
return(~script4133($int0));
232347
}
233348
return(-1, -1);

‎scripts/[proc,camdozaal_ramarno_shop_setup_button].cs2

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,14 @@ def_model $model4 = struct_param($struct0, param_1184);
55
def_string $text1 = struct_param($struct0, param_1183);
66
def_int $int5 = struct_param($struct0, param_1185);
77
def_int $int6 = 0;
8-
if ($int5 <= calc(inv_total(inv, barronite_shards_25676) + %var2953)) {
8+
def_int $int7 = 0;
9+
def_int $total8 = inv_total(inv, barronite_shards_25676);
10+
if (calc(^max_32bit_int - %var2953) < $total8) {
11+
$int7 = ^max_32bit_int;
12+
} else {
13+
$int7 = calc(%var2953 + $total8);
14+
}
15+
if ($int5 <= $int7) {
916
$int6 = 1;
1017
}
1118
if ($int1 = 1) {
@@ -23,7 +30,7 @@ if ($int1 = 1) {
2330
}
2431
}
2532
cc_deleteall($component2);
26-
def_int $int7 = 0;
33+
def_int $int9 = 0;
2734
cc_create($component2, ^iftype_text, 0);
2835
cc_setsize(12, 28, ^setsize_minus, ^setsize_abs);
2936
cc_setposition(12, 0, ^setpos_abs_left, ^setpos_abs_bottom);
@@ -35,32 +42,32 @@ if ($int1 = 1) {
3542
} else {
3643
cc_settext("<col=9f9f9f>Inactive</col>");
3744
}
38-
$int7 = 1;
39-
cc_create($component2, ^iftype_text, $int7);
45+
$int9 = 1;
46+
cc_create($component2, ^iftype_text, $int9);
4047
cc_setsize(10, 16, ^setsize_minus, ^setsize_abs);
4148
cc_setposition(0, 6, ^setpos_abs_centre, ^setpos_abs_top);
4249
cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
4350
cc_settextfont(b12_full);
4451
cc_settextshadow(true);
4552
cc_setcolour(0xff981f);
4653
cc_settext($text0);
47-
$int7 = calc($int7 + 1);
48-
cc_create($component2, ^iftype_model, $int7);
54+
$int9 = calc($int9 + 1);
55+
cc_create($component2, ^iftype_model, $int9);
4956
cc_setsize(10, 34, ^setsize_minus, ^setsize_abs);
5057
cc_setposition(0, 24, ^setpos_abs_centre, ^setpos_abs_top);
5158
cc_setmodel($model4);
5259
cc_setmodelangle(195, 1, 1545, 0, 513, 1190);
53-
$int7 = calc($int7 + 1);
54-
cc_create($component2, ^iftype_text, $int7);
60+
$int9 = calc($int9 + 1);
61+
cc_create($component2, ^iftype_text, $int9);
5562
cc_setsize(10, 42, ^setsize_minus, ^setsize_abs);
5663
cc_setposition(0, 31, ^setpos_abs_centre, ^setpos_abs_bottom);
5764
cc_settextalign(^settextalign_centre, ^settextalign_bottom, 12);
5865
cc_settextfont(p11_full);
5966
cc_settextshadow(true);
6067
cc_setcolour(^white);
6168
cc_settext($text1);
62-
$int7 = calc($int7 + 1);
63-
cc_create($component2, ^iftype_text, $int7);
69+
$int9 = calc($int9 + 1);
70+
cc_create($component2, ^iftype_text, $int9);
6471
cc_setsize(28, 28, ^setsize_minus, ^setsize_abs);
6572
cc_setposition(28, 0, ^setpos_abs_right, ^setpos_abs_bottom);
6673
cc_settextalign(^settextalign_right, ^settextalign_centre, 0);
@@ -72,10 +79,10 @@ if ($int1 = 1 | $int6 ! 1) {
7279
} else {
7380
cc_setcolour(0x0dc10d);
7481
}
75-
$int7 = calc($int7 + 1);
76-
cc_create($component2, ^iftype_model, $int7);
82+
$int9 = calc($int9 + 1);
83+
cc_create($component2, ^iftype_model, $int9);
7784
cc_setsize(24, 24, ^setsize_abs, ^setsize_abs);
7885
cc_setposition(2, 3, ^setpos_abs_right, ^setpos_abs_bottom);
7986
cc_setmodel(barronite_shards_42162);
8087
cc_setmodelangle(0, 0, 735, 707, 0, 800);
81-
$int7 = calc($int7 + 1);
88+
$int9 = calc($int9 + 1);

0 commit comments

Comments
 (0)