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

Commit 8869d6e

Browse files
Joshua-FJoshua-F
committed
Update names
1 parent 5d03202 commit 8869d6e

File tree

59 files changed

+155
-155
lines changed

Some content is hidden

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

59 files changed

+155
-155
lines changed

‎README.md

+27-27
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@
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/[proc,script943].cs2)
946+
[**943**](scripts/[proc,soul_wars_rewards_drawitem_other].cs2) `[proc,soul_wars_rewards_drawitem_other]`
947947
[**944**](scripts/[proc,script944].cs2)
948948
[**945**](scripts/[proc,script945].cs2)
949949
[**946**](scripts/[clientscript,zep_balloon_map_hover].cs2) `[clientscript,zep_balloon_map_hover]`
@@ -2238,7 +2238,7 @@
22382238
[**2235**](scripts/[clientscript,script2235].cs2)
22392239
[**2236**](scripts/[clientscript,script2236].cs2)
22402240
[**2237**](scripts/[proc,script2237].cs2)
2241-
[**2238**](scripts/[clientscript,script2238].cs2)
2241+
[**2238**](scripts/[clientscript,steelborder_closebutton].cs2) `[clientscript,steelborder_closebutton]`
22422242
[**2239**](scripts/[clientscript,keyboard_hide].cs2) `[clientscript,keyboard_hide]`
22432243
[**2240**](scripts/[clientscript,collection_init].cs2) `[clientscript,collection_init]`
22442244
[**2241**](scripts/[clientscript,script2241].cs2)
@@ -5845,7 +5845,7 @@
58455845
[**5842**](scripts/[clientscript,script5842].cs2)
58465846
[**5843**](scripts/[clientscript,if_fade].cs2) `[clientscript,if_fade]`
58475847
[**5844**](scripts/[clientscript,if_fade_timer].cs2) `[clientscript,if_fade_timer]`
5848-
[**5845**](scripts/[proc,script5845].cs2)
5848+
[**5845**](scripts/[proc,dynamic_stone_button_filled_main].cs2) `[proc,dynamic_stone_button_filled_main]`
58495849
[**5846**](scripts/[proc,buff_bar_dynamic_tooltip].cs2) `[proc,buff_bar_dynamic_tooltip]`
58505850
[**5847**](scripts/[proc,buff_bar_dynamic_graphic].cs2) `[proc,buff_bar_dynamic_graphic]`
58515851
[**5848**](scripts/[proc,buff_bar_dynamic_graphic2].cs2) `[proc,buff_bar_dynamic_graphic2]`
@@ -5866,8 +5866,8 @@
58665866
[**5863**](scripts/[clientscript,script5863].cs2)
58675867
[**5864**](scripts/[clientscript,script5864].cs2)
58685868
[**5865**](scripts/[proc,script5865].cs2)
5869-
[**5866**](scripts/[clientscript,script5866].cs2)
5870-
[**5867**](scripts/[clientscript,script5867].cs2)
5869+
[**5866**](scripts/[worldmapelementmouserepeat,mapelement_853].cs2) `[worldmapelementmouserepeat,mapelement_853]`
5870+
[**5867**](scripts/[worldmapelementmouseleave,mapelement_853].cs2) `[worldmapelementmouseleave,mapelement_853]`
58715871
[**5868**](scripts/[proc,speedrunning_misc_unlocks].cs2) `[proc,speedrunning_misc_unlocks]`
58725872
[**5869**](scripts/[proc,script5869].cs2)
58735873
[**5870**](scripts/[clientscript,script5870].cs2)
@@ -5915,10 +5915,10 @@
59155915
[**5912**](scripts/[proc,script5912].cs2)
59165916
[**5913**](scripts/[proc,script5913].cs2)
59175917
[**5914**](scripts/[clientscript,wildy_loot_init].cs2) `[clientscript,wildy_loot_init]`
5918-
[**5915**](scripts/[clientscript,script5915].cs2)
5919-
[**5916**](scripts/[clientscript,script5916].cs2)
5918+
[**5915**](scripts/[clientscript,wildy_loot_itemnote_transmit].cs2) `[clientscript,wildy_loot_itemnote_transmit]`
5919+
[**5916**](scripts/[clientscript,wildy_loot_itemnote_switch].cs2) `[clientscript,wildy_loot_itemnote_switch]`
59205920
[**5917**](scripts/[proc,script5917].cs2)
5921-
[**5918**](scripts/[clientscript,script5918].cs2)
5921+
[**5918**](scripts/[loadloc,rocks_3748].cs2) `[loadloc,rocks_3748]`
59225922
[**5919**](scripts/[proc,script5919].cs2)
59235923
[**5920**](scripts/[clientscript,script5920].cs2)
59245924
[**5921**](scripts/[proc,script5921].cs2)
@@ -5956,11 +5956,11 @@
59565956
[**5953**](scripts/[proc,script5953].cs2)
59575957
[**5954**](scripts/[proc,script5954].cs2)
59585958
[**5955**](scripts/[proc,script5955].cs2)
5959-
[**5956**](scripts/[clientscript,script5956].cs2)
5960-
[**5957**](scripts/[clientscript,script5957].cs2)
5961-
[**5958**](scripts/[clientscript,script5958].cs2)
5962-
[**5959**](scripts/[clientscript,script5959].cs2)
5963-
[**5960**](scripts/[clientscript,script5960].cs2)
5959+
[**5956**](scripts/[trigger_80,_].cs2) `[trigger_80,_]`
5960+
[**5957**](scripts/[trigger_78,_].cs2) `[trigger_78,_]`
5961+
[**5958**](scripts/[trigger_79,_].cs2) `[trigger_79,_]`
5962+
[**5959**](scripts/[trigger_81,_].cs2) `[trigger_81,_]`
5963+
[**5960**](scripts/[trigger_82,_].cs2) `[trigger_82,_]`
59645964
[**5961**](scripts/[proc,script5961].cs2)
59655965
[**5962**](scripts/[clientscript,script5962].cs2)
59665966
[**5963**](scripts/[proc,script5963].cs2)
@@ -5987,8 +5987,8 @@
59875987
[**5984**](scripts/[clientscript,script5984].cs2)
59885988
[**5985**](scripts/[clientscript,script5985].cs2)
59895989
[**5986**](scripts/[clientscript,script5986].cs2)
5990-
[**5987**](scripts/[clientscript,script5987].cs2)
5991-
[**5988**](scripts/[clientscript,script5988].cs2)
5990+
[**5987**](scripts/[worldmapelementmouserepeat,mapelement_854].cs2) `[worldmapelementmouserepeat,mapelement_854]`
5991+
[**5988**](scripts/[worldmapelementmouseleave,mapelement_854].cs2) `[worldmapelementmouseleave,mapelement_854]`
59925992
[**5989**](scripts/[proc,script5989].cs2)
59935993
[**5990**](scripts/[proc,script5990].cs2)
59945994
[**5991**](scripts/[proc,script5991].cs2)
@@ -6046,8 +6046,8 @@
60466046
[**6043**](scripts/[clientscript,script6043].cs2)
60476047
[**6044**](scripts/[proc,script6044].cs2)
60486048
[**6045**](scripts/[proc,script6045].cs2)
6049-
[**6046**](scripts/[clientscript,script6046].cs2)
6050-
[**6047**](scripts/[clientscript,script6047].cs2)
6049+
[**6046**](scripts/[worldmapelementmouserepeat,mapelement_857].cs2) `[worldmapelementmouserepeat,mapelement_857]`
6050+
[**6047**](scripts/[worldmapelementmouseleave,mapelement_857].cs2) `[worldmapelementmouseleave,mapelement_857]`
60516051
[**6048**](scripts/[clientscript,script6048].cs2)
60526052
[**6049**](scripts/[proc,script6049].cs2)
60536053
[**6050**](scripts/[proc,script6050].cs2)
@@ -6058,9 +6058,9 @@
60586058
[**6055**](scripts/[clientscript,script6055].cs2)
60596059
[**6056**](scripts/[clientscript,script6056].cs2)
60606060
[**6057**](scripts/[proc,script6057].cs2)
6061-
[**6058**](scripts/[proc,script6058].cs2)
6061+
[**6058**](scripts/[proc,spec_regen_timer_off].cs2) `[proc,spec_regen_timer_off]`
60626062
[**6059**](scripts/[proc,script6059].cs2)
6063-
[**6060**](scripts/[clientscript,script6060].cs2)
6063+
[**6060**](scripts/[clientscript,spec_regen_vartransmit].cs2) `[clientscript,spec_regen_vartransmit]`
60646064
[**6061**](scripts/[proc,script6061].cs2)
60656065
[**6062**](scripts/[clientscript,script6062].cs2)
60666066
[**6063**](scripts/[clientscript,script6063].cs2)
@@ -6074,14 +6074,14 @@
60746074
[**6071**](scripts/[proc,script6071].cs2)
60756075
[**6072**](scripts/[clientscript,script6072].cs2)
60766076
[**6073**](scripts/[proc,script6073].cs2)
6077-
[**6074**](scripts/[clientscript,script6074].cs2)
6078-
[**6075**](scripts/[clientscript,script6075].cs2)
6079-
[**6076**](scripts/[clientscript,script6076].cs2)
6080-
[**6077**](scripts/[clientscript,script6077].cs2)
6081-
[**6078**](scripts/[clientscript,script6078].cs2)
6082-
[**6079**](scripts/[clientscript,script6079].cs2)
6083-
[**6080**](scripts/[clientscript,script6080].cs2)
6084-
[**6081**](scripts/[clientscript,script6081].cs2)
6077+
[**6074**](scripts/[worldmapelementmouserepeat,mapelement_858].cs2) `[worldmapelementmouserepeat,mapelement_858]`
6078+
[**6075**](scripts/[worldmapelementmouserepeat,mapelement_859].cs2) `[worldmapelementmouserepeat,mapelement_859]`
6079+
[**6076**](scripts/[worldmapelementmouserepeat,mapelement_860].cs2) `[worldmapelementmouserepeat,mapelement_860]`
6080+
[**6077**](scripts/[worldmapelementmouseleave,mapelement_858].cs2) `[worldmapelementmouseleave,mapelement_858]`
6081+
[**6078**](scripts/[worldmapelementmouseleave,mapelement_859].cs2) `[worldmapelementmouseleave,mapelement_859]`
6082+
[**6079**](scripts/[worldmapelementmouseleave,mapelement_860].cs2) `[worldmapelementmouseleave,mapelement_860]`
6083+
[**6080**](scripts/[worldmapelementmouserepeat,mapelement_863].cs2) `[worldmapelementmouserepeat,mapelement_863]`
6084+
[**6081**](scripts/[worldmapelementmouseleave,mapelement_863].cs2) `[worldmapelementmouseleave,mapelement_863]`
60856085
[**6082**](scripts/[clientscript,script6082].cs2)
60866086
[**6083**](scripts/[clientscript,script6083].cs2)
60876087
[**6084**](scripts/[clientscript,script6084].cs2)

‎scripts/[clientscript,script1713].cs2

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// 1713
2-
[clientscript,script1713](maparea $maparea0, component $component1, int $comsubid2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
2+
[clientscript,script1713](wma $wma0, component $component1, int $comsubid2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8)
33
def_coord $coord9 = %varcint189;
44
%varcint189 = null;
5-
if (worldmap_getcurrentmap ! $maparea0) {
5+
if (worldmap_getcurrentmap ! $wma0) {
66
~worldmap_maplist_close($component1, $component3);
77
if (worldmap_isloaded = false) {
88
return;
@@ -21,19 +21,19 @@ if (worldmap_isloaded = false) {
2121
}
2222
def_coord $coord10 = null;
2323
def_int $int11 = 0;
24-
def_maparea $maparea12 = enum(int, maparea, enum_1697, $int11);
25-
while ($maparea12 ! null) {
26-
$coord10 = ~worldmap_findcoordinmap($maparea12, $coord9);
24+
def_wma $wma12 = enum(int, wma, enum_1697, $int11);
25+
while ($wma12 ! null) {
26+
$coord10 = ~worldmap_findcoordinmap($wma12, $coord9);
2727
if ($coord10 ! null) {
28-
if (worldmap_getcurrentmap ! $maparea12) {
28+
if (worldmap_getcurrentmap ! $wma12) {
2929
if (cc_find($component1, $comsubid2) = ^true) {
30-
~worldmap_loadmap($maparea12, $coord10, $component1, $component3, $component4, $component5, $component6, $component7, $component8);
30+
~worldmap_loadmap($wma12, $coord10, $component1, $component3, $component4, $component5, $component6, $component7, $component8);
3131
}
3232
} else {
3333
worldmap_jumptosourcecoord($coord10);
3434
}
3535
return;
3636
}
3737
$int11 = calc($int11 + 1);
38-
$maparea12 = enum(int, maparea, enum_1697, $int11);
38+
$wma12 = enum(int, wma, enum_1697, $int11);
3939
}

‎scripts/[clientscript,script2238].cs2

-3
This file was deleted.

‎scripts/[clientscript,script3331].cs2

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
if ($coord1 = null | worldmap_isloaded = false) {
44
return;
55
}
6-
def_maparea $maparea3 = _6623($coord1);
6+
def_wma $wma3 = _6623($coord1);
77
def_int $int4 = -1;
88
def_int $int5 = -1;
99
$int4, $int5 = worldmap_getdisplayposition;
10-
if (worldmap_coordinmap($maparea3, $coord1) = false) {
10+
if (worldmap_coordinmap($wma3, $coord1) = false) {
1111
return;
1212
}
13-
if ($maparea3 ! worldmap_getcurrentmap) {
14-
worldmap_setmap($maparea3);
13+
if ($wma3 ! worldmap_getcurrentmap) {
14+
worldmap_setmap($wma3);
1515
}
1616
if_sethide(false, $component0);
1717
if_setontimer("script3332($component0, $coord1, $mapelement2, 0, $int4, $int5)", $component0);

‎scripts/[clientscript,script5866].cs2

-3
This file was deleted.

‎scripts/[clientscript,script5867].cs2

-3
This file was deleted.

‎scripts/[clientscript,script5915].cs2

-3
This file was deleted.

‎scripts/[clientscript,script5918].cs2

-3
This file was deleted.

‎scripts/[clientscript,script5987].cs2

-3
This file was deleted.

‎scripts/[clientscript,script5988].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6046].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6047].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6060].cs2

-11
This file was deleted.

‎scripts/[clientscript,script6074].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6075].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6076].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6077].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6078].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6079].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6080].cs2

-3
This file was deleted.

‎scripts/[clientscript,script6081].cs2

-3
This file was deleted.

‎scripts/[clientscript,spec_regen_timer_off].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 4720
22
[clientscript,spec_regen_timer_off]
3-
~script6058;
3+
~spec_regen_timer_off;

‎scripts/[clientscript,spec_regen_vartransmit].cs2

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
// 6060
2+
[clientscript,spec_regen_vartransmit](component $component0, int $int1, int $int2)
3+
if (%varbit12346 = $int1 & $int2 = %var300) {
4+
return;
5+
}
6+
if (%varbit12346 = 1 | %var300 >= 1000) {
7+
~spec_regen_timer_off;
8+
} else if (%var300 < 1000) {
9+
~script6059(%var3079);
10+
}
11+
if_setonvartransmit("spec_regen_vartransmit($component0, %varbit12346, %var300){var2856, var300}", $component0);

‎scripts/[clientscript,steelborder_closebutton].cs2

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

‎scripts/[clientscript,script5916].cs2 ‎scripts/[clientscript,wildy_loot_itemnote_switch].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// 5916
2-
[clientscript,script5916](int $int0)
2+
[clientscript,wildy_loot_itemnote_switch](int $int0)
33
if (%varbit4843 ! $int0) {
44
%varbit4843 = $int0;
55
sound_synth(interface_select1, 1, 0);

‎scripts/[clientscript,wildy_loot_itemnote_transmit].cs2

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// 5915
2+
[clientscript,wildy_loot_itemnote_transmit]
3+
~script5917;

‎scripts/[clientscript,worldmap_init].cs2

+10-10
Original file line numberDiff line numberDiff line change
@@ -276,41 +276,41 @@ $int25 = calc($int25 + 1);
276276
.cc_setcolour(^white);
277277
.cc_settrans(200);
278278
.cc_sethide(true);
279-
def_maparea $maparea40 = enum(int, maparea, enum_1697, 0);
279+
def_wma $wma40 = enum(int, wma, enum_1697, 0);
280280
def_coord $coord41 = null;
281281
def_coord $coord42 = null;
282282
def_fontmetrics $fontmetrics43 = null;
283283
def_fontmetrics $fontmetrics44 = null;
284284
$string0, $int29, $int28 = "", 0, 0;
285-
def_maparea $maparea45 = enum(int, maparea, enum_1697, $int28);
286-
while ($maparea45 ! null) {
285+
def_wma $wma45 = enum(int, wma, enum_1697, $int28);
286+
while ($wma45 ! null) {
287287
$intarray0($int28) = $int25;
288288
$int28 = calc($int28 + 1);
289289
cc_create($component16, ^iftype_text, $int25);
290290
$int25 = calc($int25 + 1);
291291
cc_setsize(0, $int27, ^setsize_minus, ^setsize_abs);
292292
cc_setcolour(0xff981f);
293-
if ($maparea45 = main) {
293+
if ($wma45 = main) {
294294
$fontmetrics43, $fontmetrics44 = p12_full, p12_full;
295295
} else {
296296
$fontmetrics43, $fontmetrics44 = p11_full, p11_full;
297297
}
298298
cc_settextfont($fontmetrics44);
299299
cc_settextshadow(true);
300300
cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
301-
$string0 = worldmap_getmapname($maparea45);
301+
$string0 = worldmap_getmapname($wma45);
302302
cc_settext($string0);
303303
cc_setop(1, "Select");
304304
cc_setopbase("<col=ff9040><$string0></col>");
305305
cc_setonmouseover("xpdrops_setup_display_dropdown_hover(true, event_com, event_comsubid, .cc_getid, 0xff981f)");
306306
cc_setonmouseleave("xpdrops_setup_display_dropdown_hover(false, event_com, event_comsubid, .cc_getid, 0xff981f)");
307-
cc_setonop("worldmap_maplist_select(event_opindex, $maparea45, $component12, $component13, $component4, $component6, $component7, $component18, $component19)");
307+
cc_setonop("worldmap_maplist_select(event_opindex, $wma45, $component12, $component13, $component4, $component6, $component7, $component18, $component19)");
308308
$int29 = ~max($int29, parawidth($string0, 512, $fontmetrics43));
309-
$coord41 = ~worldmap_findcoordinmap($maparea45, %varcint188);
309+
$coord41 = ~worldmap_findcoordinmap($wma45, %varcint188);
310310
if ($coord41 ! null) {
311-
$maparea40, $coord42 = $maparea45, $coord41;
311+
$wma40, $coord42 = $wma45, $coord41;
312312
}
313-
$maparea45 = enum(int, maparea, enum_1697, $int28);
313+
$wma45 = enum(int, wma, enum_1697, $int28);
314314
}
315315
def_coord $coord46 = movecoord(0_0_0_0_0, $int25, 0, 0);
316316
cc_create($component16, ^iftype_graphic, $int25);
@@ -398,6 +398,6 @@ cc_settextfont(p11_full);
398398
cc_settextshadow(true);
399399
cc_settextalign(^settextalign_centre, ^settextalign_centre, 0);
400400
~xpdrops_setup_display_hoveroff($component12);
401-
~worldmap_loadmap($maparea40, $coord42, $component12, $component13, $component4, $component6, $component7, $component18, $component19);
401+
~worldmap_loadmap($wma40, $coord42, $component12, $component13, $component4, $component6, $component7, $component18, $component19);
402402
~worldmap_mobile_layout;
403403
if_setopkey(1, ^key_escape, 0, interface_595:4);

‎scripts/[clientscript,worldmap_maplist_open].cs2

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ if_sethide(false, $component1);
66
def_int $y5 = ^min_32bit_int;
77
def_int $y6 = ^min_32bit_int;
88
def_int $int7 = 0;
9-
def_maparea $maparea8 = null;
9+
def_wma $wma8 = null;
1010
while ($int7 <= 41) {
11-
$maparea8 = enum(int, maparea, enum_1697, $int7);
12-
if ($maparea8 ! null & cc_find($component2, calc($int7 + 1)) = ^true) {
13-
if (~worldmap_findcoordinmap($maparea8, %varcint188) ! null) {
11+
$wma8 = enum(int, wma, enum_1697, $int7);
12+
if ($wma8 ! null & cc_find($component2, calc($int7 + 1)) = ^true) {
13+
if (~worldmap_findcoordinmap($wma8, %varcint188) ! null) {
1414
if (~on_mobile = false) {
1515
$y5 = calc(cc_gety - 1);
1616
} else {
1717
$y5 = calc(cc_gety + 3);
1818
}
1919
}
20-
if (~worldmap_findcoordinmap($maparea8, %varcint401) ! null) {
20+
if (~worldmap_findcoordinmap($wma8, %varcint401) ! null) {
2121
if (~on_mobile = false) {
2222
$y6 = calc(cc_gety - 1);
2323
} else {

0 commit comments

Comments
 (0)