Skip to content

Commit

Permalink
Update names
Browse files Browse the repository at this point in the history
  • Loading branch information
@Joshua-F
Joshua-F committed Dec 13, 2022
1 parent 3510e61 commit ec59709
Show file tree
Hide file tree
Showing 18 changed files with 46 additions and 46 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6839,16 +6839,16 @@
[**6839**](scripts/[proc,script6839].cs2)
[**6840**](scripts/[clientscript,script6840].cs2)
[**6841**](scripts/[proc,script6841].cs2)
[**6842**](scripts/[proc,script6842].cs2)
[**6842**](scripts/[proc,toa_raid_level].cs2) `[proc,toa_raid_level]`
[**6843**](scripts/[clientscript,script6843].cs2)
[**6844**](scripts/[clientscript,script6844].cs2)
[**6845**](scripts/[clientscript,script6845].cs2)
[**6846**](scripts/[loadloc,stepping_stone_43989].cs2) `[loadloc,stepping_stone_43989]`
[**6847**](scripts/[loadloc,stepping_stone_43990].cs2) `[loadloc,stepping_stone_43990]`
[**6848**](scripts/[loadloc,rubble_43724].cs2) `[loadloc,rubble_43724]`
[**6849**](scripts/[loadloc,rubble_43726].cs2) `[loadloc,rubble_43726]`
[**6850**](scripts/[proc,script6850].cs2)
[**6851**](scripts/[proc,script6851].cs2)
[**6850**](scripts/[proc,text_client].cs2) `[proc,text_client]`
[**6851**](scripts/[proc,int_client].cs2) `[proc,int_client]`
[**6852**](scripts/[clientscript,script6852].cs2)
[**6853**](scripts/[clientscript,script6853].cs2)
[**6854**](scripts/[proc,script6854].cs2)
Expand Down Expand Up @@ -6929,7 +6929,7 @@
[**6938**](scripts/[clientscript,script6938].cs2)
[**6939**](scripts/[clientscript,script6939].cs2)
[**6940**](scripts/[clientscript,script6940].cs2)
[**6941**](scripts/[proc,script6941].cs2)
[**6941**](scripts/[proc,pvp_world].cs2) `[proc,pvp_world]`
[**6942**](scripts/[proc,script6942].cs2)
[**6943**](scripts/[proc,script6943].cs2)
[**6944**](scripts/[proc,script6944].cs2)
Expand Down
4 changes: 2 additions & 2 deletions scripts/[clientscript,farming_view_setpanel].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ if ($int7 > 0) {
if (testbit($flags3, 1) = ^true) {
cc_setcolour(^red);
.cc_setcolour(^red);
$string0 = append($string0, "<br>The patch is <~script6850("<col=7f0000>", "<col=ef1020>")>dead</col>.");
$string0 = append($string0, "<br>The patch is <~text_client("<col=7f0000>", "<col=ef1020>")>dead</col>.");
} else if (testbit($flags3, 0) = ^true) {
cc_setcolour(0xff981f);
.cc_setcolour(0xff981f);
$string0 = append($string0, "<br>The patch is <~script6850("<col=003f00>", "<col=ef1020>")>diseased</col>.");
$string0 = append($string0, "<br>The patch is <~text_client("<col=003f00>", "<col=ef1020>")>diseased</col>.");
} else {
cc_setcolour(0x00cf00);
.cc_setcolour(0x00cf00);
Expand Down
2 changes: 1 addition & 1 deletion scripts/[clientscript,poh_viewer_setroom].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ $string0, $int21 = ~poh_viewer_roomtooltip($string0, $int19, enum_3560, $enum1,
if ($int21 > 0) {
$string0 = append($string0, "</col>");
} else {
$string0 = append($string0, " <~script6850("<col=7f7f7f>", "<col=adadad>")>(empty)</col>");
$string0 = append($string0, " <~text_client("<col=7f7f7f>", "<col=adadad>")>(empty)</col>");
}
cc_create($component5, ^iftype_graphic, 2);
cc_setsize(17, 17, ^setsize_abs, ^setsize_abs);
Expand Down
2 changes: 1 addition & 1 deletion scripts/[clientscript,raids_partydetails_entry_op].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if (string_length($string0) > 0) {
.cc_settextalign(^settextalign_right, ^settextalign_centre, 0);
.cc_settextshadow(true);
.cc_settext($text2);
$string3 = "<$string0>:<br>Level <~script6850("<col=7c0808>", "<col=ef1020>")><$text2></col> <enum(stat, string, enum_680, $stat8)>";
$string3 = "<$string0>:<br>Level <~text_client("<col=7c0808>", "<col=ef1020>")><$text2></col> <enum(stat, string, enum_680, $stat8)>";
.cc_setonmouserepeat("tooltip_mouserepeat(event_com, event_comsubid, interface_507:36, $string3, 25, 200)");
.cc_setonmouseleave("deltooltip(interface_507:36)");
$int7, $int4 = calc($int7 + 1), calc($int4 + 1);
Expand Down
4 changes: 2 additions & 2 deletions scripts/[clientscript,stat_boosts_hud_timertooltip].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
[clientscript,stat_boosts_hud_timertooltip](component $component0, component $component1)
def_int $int2 = calc(%varcint468 - (clientclock - %varcint469) / 30);
def_int $int3 = calc(%varcint471 - (clientclock - %varcint472) / 30);
def_string $string0 = ~script3739(~script6851(0xa3170b, 0xef1020), "col");
def_string $string1 = ~script3739(~script6851(0x065b1d, 0x0dc10d), "col");
def_string $string0 = ~script3739(~int_client(0xa3170b, 0xef1020), "col");
def_string $string1 = ~script3739(~int_client(0x065b1d, 0x0dc10d), "col");
def_string $string2 = "<$string0>Stats restoring</col>";
def_string $string3 = "<$string0><~time_convert($int2, 0)></col>";
if (%varcint551 = 1) {
Expand Down
4 changes: 2 additions & 2 deletions scripts/[clientscript,xpdrops_setup_init].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ if_sethide(true, $component4);
~xpdrops_setup_init_display($component8, $component9, enum(int, string, enum_1164, -1), "Controls the position of the XP display and droplets.", 170, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component10, $component11, enum(int, string, enum_1165, -1), "Controls the text size used by the XP display and droplets.", 180, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component12, $component13, enum(int, string, enum_1166, -1), "Controls how long the XP display remains visible after each event.", 200, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component14, $component15, "Counter", "Choose which skill will have its details displayed in the number panel.<br><br>'<~script6850("<col=ef1020>", "<col=ff981f>")>Most recent</col>' will show whichever skill gained XP most recently.<br><br>If a <~script6850("<col=ef1020>", "<col=ff981f>")>tracker</col> has been set for the skill, the panel will show XP gained since the tracker's start point.", 300, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component16, $component17, "Progress bar", "Choose which skill will have its details displayed in the progress bar.<br><br>'<~script6850("<col=ef1020>", "<col=ff981f>")>Most recent</col>' will show whichever skill gained XP most recently.<br><br>If a <~script6850("<col=ef1020>", "<col=ff981f>")>goal</col> has been set for the skill, the bar will show progress towards that goal.<br><br>Otherwise it will show progress towards the next level.", 300, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component14, $component15, "Counter", "Choose which skill will have its details displayed in the number panel.<br><br>'<~text_client("<col=ef1020>", "<col=ff981f>")>Most recent</col>' will show whichever skill gained XP most recently.<br><br>If a <~text_client("<col=ef1020>", "<col=ff981f>")>tracker</col> has been set for the skill, the panel will show XP gained since the tracker's start point.", 300, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component16, $component17, "Progress bar", "Choose which skill will have its details displayed in the progress bar.<br><br>'<~text_client("<col=ef1020>", "<col=ff981f>")>Most recent</col>' will show whichever skill gained XP most recently.<br><br>If a <~text_client("<col=ef1020>", "<col=ff981f>")>goal</col> has been set for the skill, the bar will show progress towards that goal.<br><br>Otherwise it will show progress towards the next level.", 300, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component18, $component19, enum(int, string, enum_1168, -1), "Controls the text colour of the droplets.", 150, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component20, $component21, enum(int, string, enum_1170, -1), "When multiple skills increase together, their droplets may be grouped, within limits.", 300, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
~xpdrops_setup_init_display($component22, $component23, enum(int, string, enum_1140, -1), "Droplet speed.", 200, $layer1, $component4, $component6, $component7, $component47, $component8, $component9, $component10, $component11, $component12, $component13, $component14, $component15, $component16, $component17, $component18, $component19, $component20, $component21, $component22, $component23, $component24, $component25);
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,script6851].cs2 → scripts/[proc,int_client].cs2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 6851
[proc,script6851](int $colour0, int $colour1)(int)
[proc,int_client](int $colour0, int $colour1)(int)
if (~on_enhanced_any = 0) {
return($colour0);
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,poh_viewer_roomtooltip].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if ($obj5 ! obj_8245) {
if ($int3 > 0) {
$string0 = append($string0, ", <~string_findandreplace(oc_name($obj5), " ", " ")>");
} else {
$string0 = append($string0, "<br><~script6850("<col=7f7f7f>", "<col=adadad>")><~string_findandreplace(oc_name($obj5), " ", " ")>");
$string0 = append($string0, "<br><~text_client("<col=7f7f7f>", "<col=adadad>")><~string_findandreplace(oc_name($obj5), " ", " ")>");
}
$int3 = calc($int3 + 1);
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,pvp_icons_comlevelrange].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if (~deadman_world ! 0) {
$int2, $int3 = ~script5227;
}
} else {
if (~script6941 = 1) {
if (~pvp_world = 1) {
$int1 = calc(15 + $int0);
}
$int2 = calc(%varbit13027 - $int1);
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,pvp_icons_layout].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if (~deadman_world ! 0 & if_gettop = toplevelinterface_80) {
return;
}
if_sethide(false, interface_90:0);
if (~script6941 = 1) {
if (~pvp_world = 1) {
if_setsize(78, 73, ^setsize_abs, ^setsize_abs, interface_90:44);
if (%varcint53 = true) {
$int5 = 0;
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,script6941].cs2 → scripts/[proc,pvp_world].cs2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 6941
[proc,script6941]()(int)
[proc,pvp_world]()(int)
if (testbit(%var3717, 2) = ^true) {
return(1);
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,script2871].cs2
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// 2871
[proc,script2871]()(int)
if (~script6941 = 1 | ~deadman_world ! 0) {
if (~pvp_world = 1 | ~deadman_world ! 0) {
return(1);
}
return(0);
4 changes: 2 additions & 2 deletions scripts/[proc,script5555].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
[proc,script5555](component $component0, component $component1)
def_int $int2 = calc(%varcint468 - (clientclock - %varcint469) / 30);
def_int $int3 = calc(%varcint471 - (clientclock - %varcint472) / 30);
def_string $string0 = ~script3739(~script6851(0xa3170b, 0xef1020), "col");
def_string $string1 = ~script3739(~script6851(0x065b1d, 0x0dc10d), "col");
def_string $string0 = ~script3739(~int_client(0xa3170b, 0xef1020), "col");
def_string $string1 = ~script3739(~int_client(0x065b1d, 0x0dc10d), "col");
def_string $string2 = "<$string0>Stats restoring</col>";
def_string $string3 = "<$string0><~time_convert($int2, 0)></col>";
if (%varcint551 = 1) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,script6839].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ while ($int13 < $int12) {
case 4 :
$flags21, $flags22, $flags23 = %var3692, %var3693, %var3694;
}
$int24 = ~script6842($flags21, $flags22, $flags23);
$int24 = ~toa_raid_level($flags21, $flags22, $flags23);
if ($int24 = 0) {
$text0 = "Empty";
} else if ($int24 < 150) {
Expand Down
28 changes: 14 additions & 14 deletions scripts/[proc,stats_setlevels].cs2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ if (~deadman_world ! 0) {
if ($int7 ! -1) {
$int7 = calc($int7 / 10);
if ($int7 > $xp5) {
$string2 = append($string2, "|<~script6850("<col=7c0808>", "<col=ef1020>")>XP to regain:</col>");
$string3 = append($string3, "|<~script6850("<col=7c0808>", "<col=ef1020>")><~tostring_spacer(calc($int7 - $xp5), $string1)></col>");
$string2 = append($string2, "|<~text_client("<col=7c0808>", "<col=ef1020>")>XP to regain:</col>");
$string3 = append($string3, "|<~text_client("<col=7c0808>", "<col=ef1020>")><~tostring_spacer(calc($int7 - $xp5), $string1)></col>");
$int8 = 1;
}
}
Expand All @@ -38,32 +38,32 @@ if (~deadman_world ! 0) {
case attack, strength, magic :
$int10 = ~script2031(20);
if ($int10 > 0) {
$string2 = append($string2, "|<~script6850("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~script6850("<col=7c0808>", "<col=ef1020>")><~tostring_spacer($int10, $string1)></col>");
$string2 = append($string2, "|<~text_client("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~text_client("<col=7c0808>", "<col=ef1020>")><~tostring_spacer($int10, $string1)></col>");
} else {
$int9 = 1;
$string2 = append($string2, "|<~script6850("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~script6850("<col=7c0808>", "<col=ef1020>")>NONE</col>");
$string2 = append($string2, "|<~text_client("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~text_client("<col=7c0808>", "<col=ef1020>")>NONE</col>");
}
case ranged :
$int10 = ~script2031(30);
if ($int10 > 0) {
$string2 = append($string2, "|<~script6850("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~script6850("<col=7c0808>", "<col=ef1020>")><~tostring_spacer($int10, $string1)></col>");
$string2 = append($string2, "|<~text_client("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~text_client("<col=7c0808>", "<col=ef1020>")><~tostring_spacer($int10, $string1)></col>");
} else {
$int9 = 1;
$string2 = append($string2, "|<~script6850("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~script6850("<col=7c0808>", "<col=ef1020>")>NONE</col>");
$string2 = append($string2, "|<~text_client("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~text_client("<col=7c0808>", "<col=ef1020>")>NONE</col>");
}
case defence :
$int10 = ~script2031(40);
if ($int10 > 0) {
$string2 = append($string2, "|<~script6850("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~script6850("<col=7c0808>", "<col=ef1020>")><~tostring_spacer($int10, $string1)></col>");
$string2 = append($string2, "|<~text_client("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~text_client("<col=7c0808>", "<col=ef1020>")><~tostring_spacer($int10, $string1)></col>");
} else {
$int9 = 1;
$string2 = append($string2, "|<~script6850("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~script6850("<col=7c0808>", "<col=ef1020>")>NONE</col>");
$string2 = append($string2, "|<~text_client("<col=7c0808>", "<col=ef1020>")>XP permitted:</col>");
$string3 = append($string3, "|<~text_client("<col=7c0808>", "<col=ef1020>")>NONE</col>");
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,script6850].cs2 → scripts/[proc,text_client].cs2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 6850
[proc,script6850](string $string0, string $string1)(string)
[proc,text_client](string $string0, string $string1)(string)
if (~on_enhanced_any = 0) {
return($string0);
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/[proc,script6842].cs2 → scripts/[proc,toa_raid_level].cs2
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// 6842
[proc,script6842](int $flags0, int $flags1, int $flags2)(int)
[proc,toa_raid_level](int $flags0, int $flags1, int $flags2)(int)
def_int $count3 = 0;
def_struct $struct4 = null;
def_int $int5 = 0;
Expand Down
Loading

0 comments on commit ec59709

Please sign in to comment.