Skip to content

Commit

Permalink
206.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua-F committed Jul 7, 2022
1 parent 5f701c7 commit 370d1e6
Show file tree
Hide file tree
Showing 295 changed files with 6,477 additions and 1,349 deletions.
248 changes: 206 additions & 42 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/[clientscript,addtooltip].cs2
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 38
[clientscript,addtooltip](component $component0, component $component1, string $string0, int $int2, int $width3)
[clientscript,addtooltip](component $component0, component $component1, int $int2, int $width3, string $string0)
def_int $x4 = 0;
def_int $y5 = 0;
if (%varcint1 < calc(clientclock + $int2)) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/[clientscript,br_loadout_hidewarning].cs2
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
[clientscript,br_loadout_hidewarning](component $component0, int $comsubid1, int $int2)
%varcint110 = calc(clientclock + 2);
if (.cc_find($component0, calc($comsubid1 + $int2)) = ^true) {
.cc_setmodel(model_16238);
.cc_setmodelangle(0, 0, 1536, 512, 0, 1800);
.cc_setontimer("br_loadout_restorewarning(calc(clientclock + 2), event_com, event_comsubid)");
}
2 changes: 1 addition & 1 deletion scripts/[clientscript,br_loadout_insert].cs2
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if ($int13 = -1) {
return;
}
if ($int12 = 0) {
if (oc_param($namedobj11, param_850) ! $int13) {
if (oc_param($namedobj11, param_1564) ! $int13) {
return;
}
} else if (enum(int, namedobj, enum_2630, ~br_loadout_get_inv($int13)) ! null) {
Expand Down
4 changes: 2 additions & 2 deletions scripts/[clientscript,br_loadout_rearrange].cs2
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ if ($int15 = -1) {
}
def_int $int17 = 0;
if ($int13 = 0) {
if (oc_param($namedobj9, param_850) ! $int15) {
if (oc_param($namedobj9, param_1564) ! $int15) {
return;
}
$int17 = ~br_loadout_get_worn($int15);
} else {
$int17 = ~br_loadout_get_inv($int15);
}
def_namedobj $namedobj18 = enum(int, namedobj, enum_2630, $int17);
if ($namedobj18 ! null & $int12 = 0 & oc_param($namedobj18, param_850) ! $int14) {
if ($namedobj18 ! null & $int12 = 0 & oc_param($namedobj18, param_1564) ! $int14) {
return;
}
sound_synth(interface_select1, 1, 0);
Expand Down
2 changes: 1 addition & 1 deletion scripts/[clientscript,br_loadout_restorewarning].cs2
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ if (clientclock < $clock0) {
return;
}
if (cc_find($component1, $comsubid2) = ^true) {
cc_setmodel(bank_filler_7669);
cc_setmodelangle(0, 0, 512, 512, 0, 1800);
cc_setontimer(null);
}
6 changes: 5 additions & 1 deletion scripts/[clientscript,build_makeover_feet].cs2
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
// 3601
[clientscript,build_makeover_feet](component $component0, component $component1, component $component2, component $component3)
~steelborder($component0, "Yrsa's Shoe Store", 0);
def_string $text0 = "Yrsa's Shoe Store";
if (~script5548 = 1) {
$text0 = "Select a shoe style";
}
~steelborder($component0, $text0, 0);
~rebuild_makeover_feet($component1, $component2, $component3, -1);
4 changes: 2 additions & 2 deletions scripts/[clientscript,chat_op].cs2
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ switch_int ($opindex0) {
case 9 :
if ($chattype1 = ^chattype_clanchat) {
if (activeclanchannel_find_affined(^clantype_clan) = true) {
~clan_sidepanel_op(7, -1, $string1, activeclanchannel_getuserslot($string1));
~clan_sidepanel_op(7, -1, $string1, activeclanchannel_getuserslot($string1), 0);
} else {
mes("The game cannot process your Kick request now. Please reconnect to the clan's channel.");
}
Expand All @@ -21,7 +21,7 @@ switch_int ($opindex0) {
case 10 :
if ($chattype1 = ^chattype_clanchat) {
if (activeclanchannel_find_affined(^clantype_clan) = true) {
~clan_sidepanel_op(8, -1, $string1, activeclanchannel_getuserslot($string1));
~clan_sidepanel_op(8, -1, $string1, activeclanchannel_getuserslot($string1), 0);
} else {
mes("The game cannot process your Ban request now. Please reconnect to the clan's channel.");
}
Expand Down
7 changes: 6 additions & 1 deletion scripts/[clientscript,chatdefault_onkey].cs2
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,12 @@ if ($key0 = ^key_return) {
if ($int5 = 44) {
if (activeclansettings_find_listened = true & activeclanchannel_find_listened = true) {
if (activeclansettings_getallowunaffined = true) {
~chat_send(substring(%varcstring335, $index6, $length2), 4, ^clantype_clan, 0, $int9);
switch_int (%varclansetting33) {
case 1001, 1002, 1003, 1004, 1005, 1006 :
mes("You are not chatting as a guest in a channel at the moment.");
case default :
~chat_send(substring(%varcstring335, $index6, $length2), 4, ^clantype_clan, 0, $int9);
}
} else {
mes("Guests are not invited to speak in this clan's channel.");
}
Expand Down
12 changes: 8 additions & 4 deletions scripts/[clientscript,clan_sidepanel_op].cs2
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
// 4400
[clientscript,clan_sidepanel_op](string $opbase0, int $opindex0, int $int1, boolean $boolean2, int $clanslot3)
[clientscript,clan_sidepanel_op](string $opbase0, int $opindex0, int $int1, boolean $boolean2, int $clanslot3, int $int4)
def_string $string1 = removetags($opbase0);
if ($boolean2 = true) {
if (activeclanchannel_find_listened = true & $opindex0 >= 9 & compare($string1, removetags(activeclanchannel_getuserdisplayname($clanslot3))) = 0) {
~clan_sidepanel_op($opindex0, $int1, $string1, $clanslot3);
~clan_sidepanel_op($opindex0, $int1, $string1, $clanslot3, $int4);
}
} else if (activeclanchannel_find_affined(^clantype_clan) = true & compare($string1, removetags(activeclanchannel_getuserdisplayname($clanslot3))) = 0) {
~clan_sidepanel_op($opindex0, $int1, $string1, $clanslot3);
} else if ($int4 = 0 & activeclanchannel_find_affined(^clantype_clan) = true) {
if (compare($string1, removetags(activeclanchannel_getuserdisplayname($clanslot3))) = 0) {
~clan_sidepanel_op($opindex0, $int1, $string1, $clanslot3, $int4);
}
} else if ($int4 = 2 & activeclanchannel_find_affined(2) = true & compare($string1, removetags(activeclanchannel_getuserdisplayname($clanslot3))) = 0) {
~clan_sidepanel_op($opindex0, $int1, $string1, $clanslot3, $int4);
}
3 changes: 0 additions & 3 deletions scripts/[clientscript,duel_add_graphics].cs2

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/[clientscript,duel_check_button].cs2

This file was deleted.

93 changes: 0 additions & 93 deletions scripts/[clientscript,duel_confirm_initworn].cs2

This file was deleted.

77 changes: 0 additions & 77 deletions scripts/[clientscript,duel_confirm_text].cs2

This file was deleted.

57 changes: 0 additions & 57 deletions scripts/[clientscript,duel_confirm_worn].cs2

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/[clientscript,duel_hud_init].cs2

This file was deleted.

Loading

0 comments on commit 370d1e6

Please sign in to comment.