Update types & identifiers

scripts/[clientscript,1v1arena_clear_opbutton].cs2

@@ -1,6 +1,6 @@
 // 2711
-[clientscript,1v1arena_clear_opbutton](component $component0, int $int1, int $int2)
-if (.cc_find($component0, $int1) = ^true & cc_find($component0, $int2) = ^true) {
+[clientscript,1v1arena_clear_opbutton](component $component0, int $comsubid1, int $comsubid2)
+if (.cc_find($component0, $comsubid1) = ^true & cc_find($component0, $comsubid2) = ^true) {
 	sound_synth(synth_2266, 1, 0);
 	cc_setcolour(^red);
 	if_setonmouserepeat(null, $component0);

scripts/[clientscript,1v1arena_clear_resetbutton].cs2

@@ -1,12 +1,12 @@
 // 2712
-[clientscript,1v1arena_clear_resetbutton](component $component0, int $int1, int $int2, int $int3)
-if (clientclock < $int3) {
+[clientscript,1v1arena_clear_resetbutton](component $component0, int $comsubid1, int $comsubid2, int $clock3)
+if (clientclock < $clock3) {
 	return;
 }
-if (cc_find($component0, $int2) = ^true) {
+if (cc_find($component0, $comsubid2) = ^true) {
 	cc_setcolour(0xff981f);
 	if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component0);
 	if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component0);
-	if_setonop("1v1arena_clear_opbutton($component0, $int1, cc_getid)", $component0);
+	if_setonop("1v1arena_clear_opbutton($component0, $comsubid1, cc_getid)", $component0);
 }
 if_setontimer(null, $component0);

scripts/[clientscript,1v1arena_hud_button].cs2

@@ -1,13 +1,13 @@
 // 2714
-[clientscript,1v1arena_hud_button](int $int0, component $component1, int $int2)
-if ($int0 ! 1) {
+[clientscript,1v1arena_hud_button](int $opindex0, component $component1, int $comsubid2)
+if ($opindex0 ! 1) {
 	return;
 }
 sound_synth(synth_2266, 1, 0);
-if (cc_find($component1, $int2) = ^true) {
+if (cc_find($component1, $comsubid2) = ^true) {
 	cc_setcolour(^red);
 	if_setonmouserepeat(null, $component1);
 	if_setonmouseleave(null, $component1);
 	if_setonop(null, $component1);
-	if_setontimer("1v1arena_hud_resetbutton($component1, $int2, calc(clientclock + 20))", $component1);
+	if_setontimer("1v1arena_hud_resetbutton($component1, $comsubid2, calc(clientclock + 20))", $component1);
 }

scripts/[clientscript,1v1arena_hud_init].cs2

@@ -1,33 +1,33 @@
 // 2713
 [clientscript,1v1arena_hud_init](int $int0, component $component1, component $component2, component $component3, component $component4, component $component5)
 ~1v1arena_hud_toggle(false, $component1, $component2, $component3);
-def_string $string0 = "Spectator";
+def_string $op0 = "Spectator";
 cc_deleteall($component4);
-def_int $int6 = ~options_button_off($component4, 0);
-cc_create($component4, ^iftype_text, $int6);
+def_int $comsubid6 = ~options_button_off($component4, 0);
+cc_create($component4, ^iftype_text, $comsubid6);
 cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);
 cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
 cc_settextshadow(true);
 cc_settextfont(p11_full);
 cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
-cc_settext($string0);
-if_setop(1, $string0, $component4);
+cc_settext($op0);
+if_setop(1, $op0, $component4);
 cc_setcolour(0xff981f);
 if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component4);
 if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component4);
 if_setonop("1v1arena_hud_button(event_opindex, $component4, cc_getid)", $component4);
 if_setontimer(null, $component4);
-$string0 = "Start All";
+$op0 = "Start All";
 cc_deleteall($component5);
-$int6 = ~options_button_off($component5, 0);
-cc_create($component5, ^iftype_text, $int6);
+$comsubid6 = ~options_button_off($component5, 0);
+cc_create($component5, ^iftype_text, $comsubid6);
 cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);
 cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
 cc_settextshadow(true);
 cc_settextfont(p11_full);
 cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
-cc_settext($string0);
-if_setop(1, $string0, $component5);
+cc_settext($op0);
+if_setop(1, $op0, $component5);
 cc_setcolour(0xff981f);
 if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component5);
 if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component5);

scripts/[clientscript,1v1arena_hud_resetbutton].cs2

@@ -1,9 +1,9 @@
 // 2715
-[clientscript,1v1arena_hud_resetbutton](component $component0, int $int1, int $int2)
-if (clientclock < $int2) {
+[clientscript,1v1arena_hud_resetbutton](component $component0, int $comsubid1, int $clock2)
+if (clientclock < $clock2) {
 	return;
 }
-if (cc_find($component0, $int1) = ^true) {
+if (cc_find($component0, $comsubid1) = ^true) {
 	cc_setcolour(0xff981f);
 	if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component0);
 	if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component0);

scripts/[clientscript,1v1arena_results_init].cs2

@@ -1,6 +1,6 @@
 // 2710
 [clientscript,1v1arena_results_init](component $component0)
-def_string $string0 = "Clear";
+def_string $op0 = "Clear";
 cc_deleteall($component0);
 def_int $int1 = 0;
 .cc_create($component0, ^iftype_rectangle, $int1);
@@ -16,8 +16,8 @@ cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
 cc_settextshadow(true);
 cc_settextfont(p11_full);
 cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
-cc_settext($string0);
-if_setop(1, $string0, $component0);
+cc_settext($op0);
+if_setop(1, $op0, $component0);
 cc_setcolour(0xff981f);
 if_setonmouserepeat("cc_colour_swapper(event_com, cc_getid, ^white)", $component0);
 if_setonmouseleave("cc_colour_swapper(event_com, cc_getid, 0xff981f)", $component0);

scripts/[clientscript,1v1arena_spectator_endhint].cs2

@@ -1,9 +1,9 @@
 // 2723
-[clientscript,1v1arena_spectator_endhint](component $component0, int $int1, int $int2)
-if (clientclock < $int2) {
+[clientscript,1v1arena_spectator_endhint](component $component0, int $comsubid1, int $clock2)
+if (clientclock < $clock2) {
 	return;
 }
-if (cc_find($component0, $int1) = ^true) {
+if (cc_find($component0, $comsubid1) = ^true) {
 	cc_setontimer(null);
 	cc_delete;
 }

scripts/[clientscript,1v1arena_spectator_init].cs2

@@ -18,4 +18,4 @@ cc_settextshadow(true);
 cc_settextfont(quill_oblique_large);
 cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
 cc_settext("<col=ffffff>F12</col>: Exit<br><col=ffffff>PageUP</col>: Faster<br><col=ffffff>PageDOWN</col>: Slower<br>");
-cc_setontimer("1v1arena_spectator_endhint(event_com, event_comid, calc(clientclock + 400))");
+cc_setontimer("1v1arena_spectator_endhint(event_com, event_comsubid, calc(clientclock + 400))");

scripts/[clientscript,abyssalsire_overseer_update].cs2

@@ -1,3 +1,3 @@
 // 137
-[clientscript,abyssalsire_overseer_update](component $component0, int $int1)
-~abyssalsire_overseer_update($component0, calc(clientclock - $int1));
+[clientscript,abyssalsire_overseer_update](component $component0, int $clock1)
+~abyssalsire_overseer_update($component0, calc(clientclock - $clock1));

scripts/[clientscript,addtooltip].cs2

@@ -1,7 +1,7 @@
 // 38
-[clientscript,addtooltip](component $component0, component $component1, string $string0, int $int2, int $int3)
-def_int $int4 = 0;
-def_int $int5 = 0;
+[clientscript,addtooltip](component $component0, component $component1, string $string0, int $int2, int $width3)
+def_int $x4 = 0;
+def_int $y5 = 0;
 if (%varcint1 < calc(clientclock + $int2)) {
 	if (%varcint1 < clientclock) {
 		%varcint1 = clientclock;
@@ -11,22 +11,22 @@ if (%varcint1 < calc(clientclock + $int2)) {
 }
 %varcint1 = calc(clientclock + $int2 + 10);
 if (%varcint2 = 0) {
-	if ($int3 > if_getwidth(if_getlayer($component1))) {
-		$int3 = if_getwidth(if_getlayer($component1));
+	if ($width3 > if_getwidth(if_getlayer($component1))) {
+		$width3 = if_getwidth(if_getlayer($component1));
 	}
-	$int3 = calc($int3 - 4);
-	if_setsize(calc(4 + parawidth($string0, $int3, p12_full)), calc(4 + 13 * paraheight($string0, $int3, p12_full)), ^setsize_abs, ^setsize_abs, $component1);
-	$int4 = calc(if_getx($component0) + 5);
-	$int5 = calc(if_gety($component0) + if_getheight($component0) + 5);
+	$width3 = calc($width3 - 4);
+	if_setsize(calc(4 + parawidth($string0, $width3, p12_full)), calc(4 + 13 * paraheight($string0, $width3, p12_full)), ^setsize_abs, ^setsize_abs, $component1);
+	$x4 = calc(if_getx($component0) + 5);
+	$y5 = calc(if_gety($component0) + if_getheight($component0) + 5);
 	if (if_getlayer($component1) ! null) {
-		if ($int4 > calc(if_getwidth(if_getlayer($component1)) - if_getwidth($component1))) {
-			$int4 = calc(if_getwidth(if_getlayer($component1)) - if_getwidth($component1));
+		if ($x4 > calc(if_getwidth(if_getlayer($component1)) - if_getwidth($component1))) {
+			$x4 = calc(if_getwidth(if_getlayer($component1)) - if_getwidth($component1));
 		}
-		if ($int5 > calc(if_getheight(if_getlayer($component1)) - if_getheight($component1))) {
-			$int5 = calc(if_gety($component0) - if_getheight($component1) - 5);
+		if ($y5 > calc(if_getheight(if_getlayer($component1)) - if_getheight($component1))) {
+			$y5 = calc(if_gety($component0) - if_getheight($component1) - 5);
 		}
 	}
-	if_setposition($int4, $int5, ^setpos_abs_left, ^setpos_abs_top, $component1);
+	if_setposition($x4, $y5, ^setpos_abs_left, ^setpos_abs_top, $component1);
 	cc_deleteall($component1);
 	cc_create($component1, ^iftype_rectangle, 0);
 	cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);

scripts/[clientscript,adventurepath_init].cs2

@@ -5,10 +5,10 @@ def_struct $struct27 = null;
 def_enum $enum28 = null;
 def_int $int29 = 0;
 def_int $int30 = 0;
-def_int $int31 = ~adventurepath_init($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25, $component26);
-if_setonvartransmit("script2944($int31, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25, $component26){var2360, var2357}", $component2);
-if ($int31 > if_getheight($component2)) {
-	if_setscrollsize(0, $int31, $component2);
+def_int $height31 = ~adventurepath_init($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25, $component26);
+if_setonvartransmit("script2944($height31, $component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25, $component26){var2360, var2357}", $component2);
+if ($height31 > if_getheight($component2)) {
+	if_setscrollsize(0, $height31, $component2);
 } else {
 	if_setscrollsize(0, 0, $component2);
 }

scripts/[clientscript,adventurepath_item_init].cs2

@@ -12,7 +12,7 @@ if_setposition(6, 0, ^setpos_abs_left, ^setpos_abs_top, $component3);
 cc_deleteall($component1);
 cc_deleteall($component2);
 cc_deleteall($component3);
-def_int $int4 = 0;
+def_int $height4 = 0;
 def_int $int5 = 0;
 def_int $int6 = 0;
 def_enum $enum7 = struct_param($struct0, param_820);
@@ -33,7 +33,7 @@ while ($int13 < 4) {
 	if ($enum10 ! null & $enum11 ! null) {
 		cc_create($component2, ^iftype_text, $int5);
 		cc_setsize(calc(16 + if_getwidth($component2)), 40, ^setsize_abs, ^setsize_abs);
-		cc_setposition(0, $int4, ^setpos_abs_left, ^setpos_abs_top);
+		cc_setposition(0, $height4, ^setpos_abs_left, ^setpos_abs_top);
 		if ($int13 = 0) {
 			cc_settext("<u=ff981f>Free to play</u>");
 		} else if ($int13 = 1) {
@@ -48,11 +48,11 @@ while ($int13 < 4) {
 		cc_setcolour(0xff981f);
 		cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
 		$int5 = calc($int5 + 1);
-		$int4 = calc($int4 + 40);
+		$height4 = calc($height4 + 40);
 		$int15 = enum_getoutputcount($enum10);
 		while ($int14 < $int15) {
 			$namedobj12 = enum(int, namedobj, $enum10, $int14);
-			$int5, $int6, $int4 = ~adventurepath_item_entry($int4, $component2, $int5, $namedobj12, enum(namedobj, int, $enum11, $namedobj12), enum(namedobj, string, $enum9, $namedobj12), $int6);
+			$int5, $int6, $height4 = ~adventurepath_item_entry($height4, $component2, $int5, $namedobj12, enum(namedobj, int, $enum11, $namedobj12), enum(namedobj, string, $enum9, $namedobj12), $int6);
 			$int14 = calc($int14 + 1);
 		}
 	}
@@ -64,15 +64,15 @@ while ($int13 < 4) {
 	$int15 = 0;
 }
 def_int $int16 = 0;
-def_int $int17 = if_getheight($component3);
-def_int $int18 = calc($int17 - if_getheight($component2));
-if ($int4 > $int17) {
-	if_setscrollsize(0, $int4, $component2);
+def_int $height17 = if_getheight($component3);
+def_int $int18 = calc($height17 - if_getheight($component2));
+if ($height4 > $height17) {
+	if_setscrollsize(0, $height4, $component2);
 	~scrollbar_vertical($component1, $component2, "scrollbar_dragger_v2,3", "scrollbar_dragger_v2,0", "scrollbar_dragger_v2,1", "scrollbar_dragger_v2,2", "scrollbar_v2,0", "scrollbar_v2,1");
 	if_sethide(false, $component1);
 } else {
-	$int16 = calc($int17 - $int4);
-	if_setsize(if_getwidth($component3), calc($int18 + $int4), ^setsize_abs, ^setsize_abs, $component3);
+	$int16 = calc($height17 - $height4);
+	if_setsize(if_getwidth($component3), calc($int18 + $height4), ^setsize_abs, ^setsize_abs, $component3);
 	if_setposition(if_getx($component3), calc($int16 / 2), ^setpos_abs_left, ^setpos_abs_top, $component3);
 	if_sethide(true, $component1);
 }

scripts/[clientscript,adventurepath_mouseleave_path_reward].cs2

@@ -1,6 +1,6 @@
 // 2953
-[clientscript,adventurepath_mouseleave_path_reward](int $int0, component $component1, string $string0)
+[clientscript,adventurepath_mouseleave_path_reward](int $int0, component $component1, string $text0)
 ~v2_stone_button_out_filled($component1);
-~adventurepath_button_text($component1, 9, $string0);
+~adventurepath_button_text($component1, 9, $text0);
 cc_setop(1, "Show <col=ff9040>path reward");
 cc_setonop("script1601");

scripts/[clientscript,adventurepath_mouseover_path_reward].cs2

@@ -1,6 +1,6 @@
 // 2952
-[clientscript,adventurepath_mouseover_path_reward](int $int0, component $component1, string $string0)
+[clientscript,adventurepath_mouseover_path_reward](int $int0, component $component1, string $text0)
 ~v2_stone_button_in_filled($component1);
-~adventurepath_button_text($component1, 9, $string0);
+~adventurepath_button_text($component1, 9, $text0);
 cc_setop(1, "Show <col=ff9040>path reward");
 cc_setonop("script1601");

scripts/[clientscript,adventurepath_on_mouse_over].cs2

@@ -1,7 +1,7 @@
 // 2947
-[clientscript,adventurepath_on_mouse_over](component $component0, int $int1, int $int2)
-if ($int2 = 1 & cc_find($component0, $int1) = ^true) {
+[clientscript,adventurepath_on_mouse_over](component $component0, int $comsubid1, int $int2)
+if ($int2 = 1 & cc_find($component0, $comsubid1) = ^true) {
 	cc_setoutline(3);
-} else if (cc_find($component0, $int1) = ^true) {
+} else if (cc_find($component0, $comsubid1) = ^true) {
 	cc_setoutline(0);
 }

scripts/[clientscript,adventurepath_open_url].cs2

@@ -1,4 +1,4 @@
 // 3003
-[clientscript,adventurepath_open_url](string $string0)
+[clientscript,adventurepath_open_url](string $url0)
 sound_synth(synth_2266, 1, 0);
-~openurl_raw($string0, true, false);
+~openurl_raw($url0, true, false);

scripts/[clientscript,adventurepath_set_info_transmit].cs2

@@ -7,14 +7,14 @@ def_enum $enum21 = enum(int, enum, enum_2620, %var2357);
 if ($enum21 = null) {
 	return;
 }
-def_int $int22 = 0;
+def_int $count22 = 0;
 def_struct $struct23 = null;
 def_int $int24 = struct_param($struct23, param_806);
-while ($int22 < enum_getoutputcount($enum21)) {
-	$struct23 = enum(int, struct, $enum21, $int22);
+while ($count22 < enum_getoutputcount($enum21)) {
+	$struct23 = enum(int, struct, $enum21, $count22);
 	if ($struct23 ! null & $int24 = %var2358) {
 		~adventurepath_set_info($int24, $component0, $component1, $component2, $component3, $struct23, $component4, $component5, $component6, $component7, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20);
 		return;
 	}
-	$int22 = calc($int22 + 1);
+	$count22 = calc($count22 + 1);
 }

scripts/[clientscript,adventurepath_side_settings_mouseleave].cs2

@@ -1,6 +1,6 @@
 // 3340
-[clientscript,adventurepath_side_settings_mouseleave](component $component0, int $int1)
-if (cc_find($component0, $int1) = ^true) {
+[clientscript,adventurepath_side_settings_mouseleave](component $component0, int $comsubid1)
+if (cc_find($component0, $comsubid1) = ^true) {
 	cc_settrans(0);
 }
 ~v2_stone_button_change_out($component0, 0);

scripts/[clientscript,adventurepath_side_settings_mouseover].cs2

@@ -1,6 +1,6 @@
 // 3339
-[clientscript,adventurepath_side_settings_mouseover](component $component0, int $int1)
-if (cc_find($component0, $int1) = ^true) {
+[clientscript,adventurepath_side_settings_mouseover](component $component0, int $comsubid1)
+if (cc_find($component0, $comsubid1) = ^true) {
 	cc_settrans(80);
 }
 ~v2_stone_button_change_in($component0, 0);

scripts/[clientscript,adventurepath_task_init].cs2

@@ -1,7 +1,7 @@
 // 2949
-[clientscript,adventurepath_task_init](component $component0, int $int1, 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, int $int15, component $component16, component $component17, component $component18, component $component19, component $component20, component $component21, component $component22, component $component23, component $component24, component $component25)
+[clientscript,adventurepath_task_init](component $component0, int $int1, 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, int $opindex15, component $component16, component $component17, component $component18, component $component19, component $component20, component $component21, component $component22, component $component23, component $component24, component $component25)
 sound_synth(synth_2266, 1, 0);
-if ($int15 ! 1) {
+if ($opindex15 ! 1) {
 	return;
 }
 if (%var2357 ! $int1) {

scripts/[clientscript,adventurepath_voucher_init].cs2

@@ -1,3 +1,3 @@
 // 2840
-[clientscript,adventurepath_voucher_init](int $int0, string $string0)
-~adventurepath_voucher_init($int0, $string0);
+[clientscript,adventurepath_voucher_init](int $int0, string $text0)
+~adventurepath_voucher_init($int0, $text0);

scripts/[clientscript,adventurepath_voucher_op_init].cs2

@@ -1,4 +1,4 @@
 // 1603
-[clientscript,adventurepath_voucher_op_init](int $int0, string $string0)
+[clientscript,adventurepath_voucher_op_init](int $int0, string $text0)
 sound_synth(synth_2266, 1, 0);
-~adventurepath_voucher_init($int0, $string0);
+~adventurepath_voucher_init($int0, $text0);

scripts/[clientscript,agilityarena_rewards_gracefulcancel].cs2

@@ -1,3 +1,3 @@
 // 2037
-[clientscript,agilityarena_rewards_gracefulcancel](component $component0, string $string0, boolean $boolean1)
-~agilityarena_rewards_gracefulcancel($component0, $string0, $boolean1);
+[clientscript,agilityarena_rewards_gracefulcancel](component $component0, string $text0, boolean $boolean1)
+~agilityarena_rewards_gracefulcancel($component0, $text0, $boolean1);

scripts/[clientscript,aide_map_marker].cs2

@@ -1,5 +1,5 @@
 // 2042
-[clientscript,aide_map_marker](component $component0, int $int1)
-if (cc_find($component0, $int1) = ^true) {
+[clientscript,aide_map_marker](component $component0, int $comsubid1)
+if (cc_find($component0, $comsubid1) = ^true) {
 	~aide_map_marker($component0);
 }

scripts/[clientscript,aide_map_tutors].cs2

@@ -1,6 +1,6 @@
 // 2040
-[clientscript,aide_map_tutors](boolean $boolean0, component $component1, int $int2, component $component3)
-if (cc_find($component1, $int2) = ^true) {
+[clientscript,aide_map_tutors](boolean $boolean0, component $component1, int $comsubid2, component $component3)
+if (cc_find($component1, $comsubid2) = ^true) {
 	sound_synth(synth_2266, 1, 0);
 	~aide_map_tutors($boolean0, $component3, $component1);
 }