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

Commit 7ed4651

Browse files
Joshua-FJoshua-F
committed
204.6
1 parent 651fe7b commit 7ed4651

File tree

63 files changed

+518
-312
lines changed

Some content is hidden

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

63 files changed

+518
-312
lines changed

‎README.md

+26-3
Original file line numberDiff line numberDiff line change
@@ -943,9 +943,6 @@
943943
[**940**](scripts/[clientscript,peng_observer_init].cs2) `[clientscript,peng_observer_init]`
944944
[**941**](scripts/[clientscript,peng_observer_borders].cs2) `[clientscript,peng_observer_borders]`
945945
[**942**](scripts/[proc,peng_observer_borders].cs2) `[proc,peng_observer_borders]`
946-
[**943**](scripts/[clientscript,script943].cs2)
947-
[**944**](scripts/[clientscript,script944].cs2)
948-
[**945**](scripts/[proc,script945].cs2)
949946
[**946**](scripts/[clientscript,zep_balloon_map_hover].cs2) `[clientscript,zep_balloon_map_hover]`
950947
[**947**](scripts/[clientscript,script947].cs2)
951948
[**948**](scripts/[clientscript,fade_overlay].cs2) `[clientscript,fade_overlay]`
@@ -2177,6 +2174,8 @@
21772174
[**2174**](scripts/[proc,tournament_beta_world].cs2) `[proc,tournament_beta_world]`
21782175
[**2175**](scripts/[proc,nosavegame_world].cs2) `[proc,nosavegame_world]`
21792176
[**2176**](scripts/[clientscript,logout_layout_update].cs2) `[clientscript,logout_layout_update]`
2177+
[**2177**](scripts/[proc,script2177].cs2)
2178+
[**2178**](scripts/[proc,script2178].cs2)
21802179
[**2179**](scripts/[proc,deadman_spectator_names].cs2) `[proc,deadman_spectator_names]`
21812180
[**2180**](scripts/[clientscript,deadman_spectator_single].cs2) `[clientscript,deadman_spectator_single]`
21822181
[**2181**](scripts/[clientscript,deadman_spectator_double].cs2) `[clientscript,deadman_spectator_double]`
@@ -2236,6 +2235,7 @@
22362235
[**2235**](scripts/[clientscript,script2235].cs2)
22372236
[**2236**](scripts/[clientscript,script2236].cs2)
22382237
[**2237**](scripts/[proc,script2237].cs2)
2238+
[**2238**](scripts/[clientscript,script2238].cs2)
22392239
[**2239**](scripts/[clientscript,keyboard_hide].cs2) `[clientscript,keyboard_hide]`
22402240
[**2240**](scripts/[clientscript,collection_init].cs2) `[clientscript,collection_init]`
22412241
[**2241**](scripts/[clientscript,script2241].cs2)
@@ -4559,6 +4559,7 @@
45594559
[**4559**](scripts/[clientscript,fishing_spot_indicator_tile_setup].cs2) `[clientscript,fishing_spot_indicator_tile_setup]`
45604560
[**4560**](scripts/[proc,fishing_spot_indicator_tile_setup].cs2) `[proc,fishing_spot_indicator_tile_setup]`
45614561
[**4561**](scripts/[proc,welcome_screen_toggle].cs2) `[proc,welcome_screen_toggle]`
4562+
[**4562**](scripts/[clientscript,script4562].cs2)
45624563
[**4563**](scripts/[proc,script4563].cs2)
45634564
[**4564**](scripts/[clientscript,settings_player_attack_options].cs2) `[clientscript,settings_player_attack_options]`
45644565
[**4565**](scripts/[clientscript,settings_npc_attack_options].cs2) `[clientscript,settings_npc_attack_options]`
@@ -4572,6 +4573,7 @@
45724573
[**4573**](scripts/[clientscript,settings_side_dropdown_transmit].cs2) `[clientscript,settings_side_dropdown_transmit]`
45734574
[**4574**](scripts/[proc,settings_side_dropdown_update].cs2) `[proc,settings_side_dropdown_update]`
45744575
[**4575**](scripts/[clientscript,settings_side_dropdown_hover].cs2) `[clientscript,settings_side_dropdown_hover]`
4576+
[**4576**](scripts/[proc,script4576].cs2)
45754577
[**4577**](scripts/[proc,settings_toggle_roof].cs2) `[proc,settings_toggle_roof]`
45764578
[**4578**](scripts/[proc,settings_boss_health_overlay].cs2) `[proc,settings_boss_health_overlay]`
45774579
[**4579**](scripts/[proc,settings_standard_health_overlay].cs2) `[proc,settings_standard_health_overlay]`
@@ -5914,6 +5916,7 @@
59145916
[**5916**](scripts/[clientscript,script5916].cs2)
59155917
[**5917**](scripts/[proc,script5917].cs2)
59165918
[**5918**](scripts/[clientscript,script5918].cs2)
5919+
[**5919**](scripts/[proc,script5919].cs2)
59175920
[**5920**](scripts/[clientscript,script5920].cs2)
59185921
[**5921**](scripts/[proc,script5921].cs2)
59195922
[**5922**](scripts/[proc,settings_buff_cannon_ammo].cs2) `[proc,settings_buff_cannon_ammo]`
@@ -6022,3 +6025,23 @@
60226025
[**6025**](scripts/[proc,script6025].cs2)
60236026
[**6026**](scripts/[clientscript,setgameoption].cs2) `[clientscript,setgameoption]`
60246027
[**6027**](scripts/[clientscript,script6027].cs2)
6028+
[**6028**](scripts/[proc,script6028].cs2)
6029+
[**6029**](scripts/[clientscript,script6029].cs2)
6030+
[**6030**](scripts/[proc,script6030].cs2)
6031+
[**6031**](scripts/[clientscript,script6031].cs2)
6032+
[**6032**](scripts/[proc,script6032].cs2)
6033+
[**6033**](scripts/[clientscript,script6033].cs2)
6034+
[**6034**](scripts/[proc,script6034].cs2)
6035+
[**6035**](scripts/[clientscript,script6035].cs2)
6036+
[**6036**](scripts/[clientscript,script6036].cs2)
6037+
[**6037**](scripts/[proc,script6037].cs2)
6038+
[**6038**](scripts/[clientscript,script6038].cs2)
6039+
[**6039**](scripts/[clientscript,script6039].cs2)
6040+
[**6040**](scripts/[clientscript,script6040].cs2)
6041+
[**6041**](scripts/[clientscript,script6041].cs2)
6042+
[**6042**](scripts/[proc,script6042].cs2)
6043+
[**6043**](scripts/[clientscript,script6043].cs2)
6044+
[**6044**](scripts/[proc,script6044].cs2)
6045+
[**6045**](scripts/[proc,script6045].cs2)
6046+
[**6046**](scripts/[clientscript,script6046].cs2)
6047+
[**6047**](scripts/[clientscript,script6047].cs2)

‎scripts/[clientscript,combat_interface_setup].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ if (%varbit357 = 1) {
250250
} else if (%varbit357 = 29) {
251251
$op0, $string4, $graphic14 = "Stab", "(Accurate)<br>(Stab)<br>(Attack XP)", "combaticons,7";
252252
$op1, $string5, $graphic15 = "Lunge", "(Aggressive)<br>(Stab)<br>(Strength XP)", "combaticons,6";
253-
$op2, $string6, $graphic16 = "Slash", "(Aggressive)<br>(Slash)<br>(Strength XP)", "combaticons,5";
253+
$op2, $string6, $graphic16 = "Pound", "(Aggressive)<br>(Crush)<br>(Strength XP)", "combaticons,5";
254254
$op3, $string7, $graphic17 = "Block", "(Defensive)<br>(Stab)<br>(Defence XP)", "combaticons,4";
255255
} else {
256256
$op0, $string4, $graphic14 = "Punch", "(Accurate)<br>(Crush)<br>(Attack XP)", "combaticons,14";

‎scripts/[clientscript,hp_bar_reset].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 3429
2-
[clientscript,hp_bar_reset](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)
3-
~hp_bar_reset($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15);
2+
[clientscript,hp_bar_reset](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, int $trans17)
3+
~hp_bar_reset($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $trans17);

‎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, 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);
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, component $component11, int $int12)
3+
~hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $int12);

‎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, component $component7, component $component8, component $component9, component $component10)
3-
def_int $trans11 = if_gettrans($component0);
4-
if ($trans11 > 0) {
5-
~hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $trans11);
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, component $component11)
3+
def_int $trans12 = if_gettrans($component0);
4+
if ($trans12 > 0) {
5+
~hp_hud_fade_in($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $trans12);
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, 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);
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, component $component11, int $int12)
3+
~hp_hud_fade_out($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $int12);

‎scripts/[clientscript,hp_hud_init].cs2

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
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, int $int10, int $int11, int $int12, component $component13, component $component14, component $component15, component $component16, component $component17)
3-
~script4729($component1, $component17, setbit(setbit(setbit(52984, 13), 12), 17), ^setpos_abs_left, ^setpos_abs_top, true);
4-
if_setonsubchange("hp_hud_pos(0, $component0, $component3, $component4, $component5, $component9, $component6, $component7, $component8, $component13, $component14, $component15, $component16, %varbit12401, $component2, $component17, $component1)", $component0);
5-
if_setonvartransmit("hp_hud_update($component3, $component6, $component7, $component8, $component4, $component9, $component13, $component14, $component15, $component16, false){var1682, var1683}", $component6);
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, int $int11, int $int12, int $int13, component $component14, component $component15, component $component16, component $component17, component $component18)
3+
~script4729($component1, $component18, setbit(setbit(setbit(52984, 13), 12), 17), ^setpos_abs_left, ^setpos_abs_top, true);
4+
if_setonsubchange("hp_hud_pos(0, $component0, $component3, $component4, $component5, $component10, $component6, $component7, $component8, $component9, $component14, $component15, $component16, $component17, %varbit12401, $component2, $component18, $component1)", $component0);
5+
if_setonvartransmit("hp_hud_update($component3, $component6, $component7, $component8, $component9, $component4, $component10, $component14, $component15, $component16, $component17, false){var1682, var1683}", $component6);

‎scripts/[clientscript,hp_hud_open].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 2376
2-
[clientscript,hp_hud_open](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)
3-
~hp_hud_open($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17);
2+
[clientscript,hp_hud_open](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)
3+
~hp_hud_open($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18);

‎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, component $component9, component $component10, component $component11, component $component12, int $int13, component $component14, component $component15, component $component16)
3-
~hp_hud_pos($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $int13, $component14, $component15, $component16);
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, component $component13, int $int14, component $component15, component $component16, component $component17)
3+
~hp_hud_pos($int0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $int14, $component15, $component16, $component17);

‎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, component $component5, component $component6, component $component7, component $component8, component $component9, boolean $boolean10)
3-
~hp_hud_update($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $boolean10);
2+
[clientscript,hp_hud_update](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, boolean $boolean11)
3+
~hp_hud_update($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $boolean11);

‎scripts/[clientscript,hp_hud_update_bar].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 62
2-
[clientscript,hp_hud_update_bar](component $component0, int $width1)
3-
~hp_hud_update_bar($component0, $width1);
2+
[clientscript,hp_hud_update_bar](component $component0, int $width1, int $int2)
3+
~hp_hud_update_bar($component0, $width1, $int2);

‎scripts/[clientscript,inventory_antidrag_update].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ if (cc_find($component0, $comsubid1) = ^true) {
44
if (~script6016 = 1) {
55
cc_setdragdeadtime(%varbit13830);
66
} else {
7-
cc_setdragdeadtime(5);
7+
cc_setdragdeadtime(6);
88
}
99
}

‎scripts/[clientscript,inventory_init].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ while ($size2 < $size3) {
99
cc_setgraphicshadow(0x333333);
1010
cc_setoutline(1);
1111
cc_setdragdeadzone(5);
12-
cc_setdragdeadtime(5);
12+
cc_setdragdeadtime(6);
1313
cc_sethide(false);
1414
$size2 = calc($size2 + 1);
1515
}

‎scripts/[clientscript,music_init].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ cc_deleteall($component1);
44
if_setscrollpos(0, 0, $component1);
55
def_int $count7 = enum_getoutputcount(enum_818);
66
if_setontimer("music_init_counter(event_com, $count7)", $component3);
7-
if_setonvartransmit("music_vartransmit(event_com, $component3, $count7){var568, var20, var21, var22, var23, var24, var25, var298, var311, var346, var414, var464, var598, var662, var721, var906, var1009, var1338, var1681, var2065, var2237, var2950}", $component1);
7+
if_setonvartransmit("music_vartransmit(event_com, $component3, $count7){var568, var20, var21, var22, var23, var24, var25, var298, var311, var346, var414, var464, var598, var662, var721, var906, var1009, var1338, var1681, var2065, var2237, var2950, var3418}", $component1);
88
def_int $countarray0($count7);
99
def_int $count8 = 0;
1010
while ($count8 < $count7) {

‎scripts/[clientscript,music_init_component].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ if (cc_find($component0, $comsubid1) = ^true) {
6666
$flags8 = %var2237;
6767
case 21 :
6868
$flags8 = %var2950;
69+
case 22 :
70+
$flags8 = %var3418;
6971
}
7072
if (testbit($flags8, $index7) = ^true) {
7173
~music_setcolour(0x0dc10d);
72-
} else if ($int4 = 331 & %varbit1028 > 35) {
73-
~music_setcolour(0x0dc10d);
7474
} else {
7575
~music_setcolour(^red);
7676
}

‎scripts/[clientscript,music_init_counter].cs2

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// 2257
22
[clientscript,music_init_counter](component $component0, int $count1)
33
if_setontimer(null, $component0);
4-
def_int $flagsarray0(calc(21 + 1));
4+
def_int $flagsarray0(calc(22 + 1));
55
$flagsarray0(1) = %var20;
66
$flagsarray0(2) = %var21;
77
$flagsarray0(3) = %var22;
@@ -23,6 +23,7 @@ $flagsarray0(18) = %var1681;
2323
$flagsarray0(19) = %var2065;
2424
$flagsarray0(20) = %var2237;
2525
$flagsarray0(21) = %var2950;
26+
$flagsarray0(22) = %var3418;
2627
def_int $int2 = 0;
2728
def_coord $coord3 = null;
2829
def_int $int4 = 0;
@@ -33,8 +34,6 @@ while ($count5 < $count1) {
3334
if ($coord3 ! null) {
3435
if (testbit($flagsarray0(coordx($coord3)), coordz($coord3)) = ^true) {
3536
$int4 = calc($int4 + 1);
36-
} else if ($int2 = 331 & %varbit1028 > 35) {
37-
$int4 = calc($int4 + 1);
3837
}
3938
} else {
4039
$int4 = calc($int4 + 1);

‎scripts/[clientscript,music_vartransmit].cs2

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 313
22
[clientscript,music_vartransmit](component $component0, component $component1, int $count2)
3-
def_int $flagsarray0(calc(21 + 1));
3+
def_int $flagsarray0(calc(22 + 1));
44
$flagsarray0(1) = %var20;
55
$flagsarray0(2) = %var21;
66
$flagsarray0(3) = %var22;
@@ -22,6 +22,7 @@ $flagsarray0(18) = %var1681;
2222
$flagsarray0(19) = %var2065;
2323
$flagsarray0(20) = %var2237;
2424
$flagsarray0(21) = %var2950;
25+
$flagsarray0(22) = %var3418;
2526
def_int $int3 = 0;
2627
def_coord $coord4 = null;
2728
def_int $int5 = 0;
@@ -34,9 +35,6 @@ while ($count6 < $count2) {
3435
if (testbit($flagsarray0(coordx($coord4)), coordz($coord4)) = ^true) {
3536
~music_setcolour(0x0dc10d);
3637
$int5 = calc($int5 + 1);
37-
} else if ($int3 = 331 & %varbit1028 > 35) {
38-
~music_setcolour(0x0dc10d);
39-
$int5 = calc($int5 + 1);
4038
} else {
4139
~music_setcolour(^red);
4240
}

‎scripts/[clientscript,script2238].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 2238
2+
[clientscript,script2238](component $component0, string $op0)
3+
~script4215($component0, $op0);

‎scripts/[clientscript,script4562].cs2

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// 4562
2+
[clientscript,script4562](component $component0, component $component1, component $component2, component $component3)
3+
~script4576($component0, "arrows_curved,0", "Rotate Clockwise", 1, $component3);
4+
~script4576($component1, "arrows_curved,3", "Rotate Anticlockwise", -1, $component3);
5+
~script5919($component2, null, "Confirm");
6+
if_setonvartransmit("script6031($component3){var3421}", $component3);
7+
~script6032($component3);

‎scripts/[clientscript,script6029].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 6029
2+
[clientscript,script6029](int $int0, component $component1)
3+
~script6030($int0, $component1);

‎scripts/[clientscript,script6031].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 6031
2+
[clientscript,script6031](component $component0)
3+
~script6032($component0);

‎scripts/[clientscript,script6033].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 6033
2+
[clientscript,script6033](component $component0, graphic $graphic1, string $string0, boolean $boolean2)
3+
~script6034($component0, $graphic1, $string0, $boolean2);

0 commit comments

Comments
 (0)