Skip to content

Commit bd4f526

Browse files
hunterwbhunterwb
committed
190.1
1 parent bcb0ea9 commit bd4f526

File tree

121 files changed

+1821
-400
lines changed

Some content is hidden

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

121 files changed

+1821
-400
lines changed

‎README.md

+68-4
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
[**115**](scripts/[clientscript,options_gfx_windowmode_init].cs2) `[clientscript,options_gfx_windowmode_init]`
119119
[**116**](scripts/[clientscript,options_gfx_windowmode_check].cs2) `[clientscript,options_gfx_windowmode_check]`
120120
[**117**](scripts/[proc,options_gfx_windowmode].cs2) `[proc,options_gfx_windowmode]`
121-
[**118**](scripts/[clientscript,death_deathkeepinit].cs2) `[clientscript,death_deathkeepinit]`
121+
[**118**](scripts/script118.cs2)
122122
[**119**](scripts/[clientscript,component_pulse_start].cs2) `[clientscript,component_pulse_start]`
123123
[**120**](scripts/[proc,options_gfx_togglebox].cs2) `[proc,options_gfx_togglebox]`
124124
[**121**](scripts/[clientscript,options_gfx_mouseeffect].cs2) `[clientscript,options_gfx_mouseeffect]`
@@ -972,6 +972,15 @@
972972
[**969**](scripts/[clientscript,stake_tooltip].cs2) `[clientscript,stake_tooltip]`
973973
[**970**](scripts/[clientscript,logout_op].cs2) `[clientscript,logout_op]`
974974
[**971**](scripts/[clientscript,ntk_init].cs2) `[clientscript,ntk_init]`
975+
[**972**](scripts/script972.cs2)
976+
[**973**](scripts/script973.cs2)
977+
[**974**](scripts/script974.cs2)
978+
[**975**](scripts/script975.cs2)
979+
[**976**](scripts/script976.cs2)
980+
[**977**](scripts/script977.cs2)
981+
[**978**](scripts/script978.cs2)
982+
[**979**](scripts/script979.cs2)
983+
[**980**](scripts/script980.cs2)
975984
[**981**](scripts/[clientscript,keybind_build_dropdown].cs2) `[clientscript,keybind_build_dropdown]`
976985
[**982**](scripts/[proc,keybind_build_dropdown].cs2) `[proc,keybind_build_dropdown]`
977986
[**983**](scripts/[clientscript,keybind_dropdown_select].cs2) `[clientscript,keybind_dropdown_select]`
@@ -1591,10 +1600,7 @@
15911600
[**1597**](scripts/[clientscript,deadman_delay_abortion].cs2) `[clientscript,deadman_delay_abortion]`
15921601
[**1598**](scripts/[proc,skill_guide_subsection_hunter].cs2) `[proc,skill_guide_subsection_hunter]`
15931602
[**1599**](scripts/[proc,skill_guide_data_hunter].cs2) `[proc,skill_guide_data_hunter]`
1594-
[**1600**](scripts/[clientscript,deathkeep_invtransmit].cs2) `[clientscript,deathkeep_invtransmit]`
1595-
[**1601**](scripts/[proc,deathkeep_build].cs2) `[proc,deathkeep_build]`
15961603
[**1602**](scripts/[proc,raids_storage_shared_warning].cs2) `[proc,raids_storage_shared_warning]`
1597-
[**1603**](scripts/[clientscript,deathkeep_infomessage].cs2) `[clientscript,deathkeep_infomessage]`
15981604
[**1604**](scripts/[clientscript,raids_storage_private_prompt].cs2) `[clientscript,raids_storage_private_prompt]`
15991605
[**1605**](scripts/[proc,raids_storage_private_prompt].cs2) `[proc,raids_storage_private_prompt]`
16001606
[**1606**](scripts/[clientscript,raids_storage_private_items].cs2) `[clientscript,raids_storage_private_items]`
@@ -1686,6 +1692,7 @@
16861692
[**1692**](scripts/[clientscript,poh_jewellery_box_timeout].cs2) `[clientscript,poh_jewellery_box_timeout]`
16871693
[**1693**](scripts/script1693.cs2)
16881694
[**1694**](scripts/script1694.cs2)
1695+
[**1695**](scripts/script1695.cs2)
16891696
[**1696**](scripts/[proc,agilityarena_rewards_initbutton].cs2) `[proc,agilityarena_rewards_initbutton]`
16901697
[**1697**](scripts/[proc,magic_spacer_tostring].cs2) `[proc,magic_spacer_tostring]`
16911698
[**1698**](scripts/[clientscript,blast_mining_hud_init].cs2) `[clientscript,blast_mining_hud_init]`
@@ -3442,3 +3449,60 @@
34423449
[**3449**](scripts/script3449.cs2)
34433450
[**3450**](scripts/script3450.cs2)
34443451
[**3451**](scripts/script3451.cs2)
3452+
[**3452**](scripts/script3452.cs2)
3453+
[**3453**](scripts/script3453.cs2)
3454+
[**3454**](scripts/script3454.cs2)
3455+
[**3455**](scripts/script3455.cs2)
3456+
[**3456**](scripts/script3456.cs2)
3457+
[**3457**](scripts/script3457.cs2)
3458+
[**3458**](scripts/script3458.cs2)
3459+
[**3459**](scripts/script3459.cs2)
3460+
[**3460**](scripts/script3460.cs2)
3461+
[**3461**](scripts/script3461.cs2)
3462+
[**3462**](scripts/script3462.cs2)
3463+
[**3463**](scripts/script3463.cs2)
3464+
[**3464**](scripts/script3464.cs2)
3465+
[**3465**](scripts/script3465.cs2)
3466+
[**3466**](scripts/script3466.cs2)
3467+
[**3467**](scripts/script3467.cs2)
3468+
[**3468**](scripts/script3468.cs2)
3469+
[**3469**](scripts/script3469.cs2)
3470+
[**3470**](scripts/script3470.cs2)
3471+
[**3471**](scripts/script3471.cs2)
3472+
[**3472**](scripts/script3472.cs2)
3473+
[**3473**](scripts/script3473.cs2)
3474+
[**3474**](scripts/script3474.cs2)
3475+
[**3475**](scripts/script3475.cs2)
3476+
[**3476**](scripts/script3476.cs2)
3477+
[**3477**](scripts/script3477.cs2)
3478+
[**3478**](scripts/script3478.cs2)
3479+
[**3479**](scripts/script3479.cs2)
3480+
[**3480**](scripts/script3480.cs2)
3481+
[**3481**](scripts/script3481.cs2)
3482+
[**3482**](scripts/script3482.cs2)
3483+
[**3483**](scripts/script3483.cs2)
3484+
[**3484**](scripts/script3484.cs2)
3485+
[**3485**](scripts/script3485.cs2)
3486+
[**3486**](scripts/script3486.cs2)
3487+
[**3487**](scripts/script3487.cs2)
3488+
[**3488**](scripts/script3488.cs2)
3489+
[**3489**](scripts/script3489.cs2)
3490+
[**3490**](scripts/script3490.cs2)
3491+
[**3491**](scripts/script3491.cs2)
3492+
[**3492**](scripts/script3492.cs2)
3493+
[**3493**](scripts/script3493.cs2)
3494+
[**3494**](scripts/script3494.cs2)
3495+
[**3495**](scripts/script3495.cs2)
3496+
[**3496**](scripts/script3496.cs2)
3497+
[**3497**](scripts/script3497.cs2)
3498+
[**3498**](scripts/script3498.cs2)
3499+
[**3499**](scripts/script3499.cs2)
3500+
[**3500**](scripts/script3500.cs2)
3501+
[**3501**](scripts/script3501.cs2)
3502+
[**3502**](scripts/script3502.cs2)
3503+
[**3503**](scripts/script3503.cs2)
3504+
[**3504**](scripts/script3504.cs2)
3505+
[**3505**](scripts/script3505.cs2)
3506+
[**3506**](scripts/script3506.cs2)
3507+
[**3507**](scripts/script3507.cs2)
3508+
[**3508**](scripts/script3508.cs2)

‎scripts/[clientscript,barrows_overlay_init].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[clientscript,barrows_overlay_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10)
33
~script1490($component1);
44
~barrows_overlay_reward($component9);
5-
if_setonvartransmit("barrows_overlay_reward($component9){var453}", $component0);
5+
if_setonvartransmit("barrows_overlay_reward($component9){var453, var1697}", $component0);
66
cc_deleteall($component10);
77
def_int $int11 = ~script1071("Ahrim", 0, $component10);
88
def_int $int12 = ~script1071("Dharok", 1, $component10);

‎scripts/[clientscript,barrows_overlay_size].cs2

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
// 140
22
[clientscript,barrows_overlay_size](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, int $int10)
33
~barrows_overlay_size($component0, $component1, $component2, $component3, $component4, $component5, $component6, $component7, $component8, $component9, $int10);
4+
~barrows_overlay_reward($component8);

‎scripts/[clientscript,deadman_delay].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if ($int3 = 1) {
99
}
1010
if_settext($string1, interface_228:0);
1111
if_sethide(false, interface_228:1);
12-
def_component $component4 = enum(component, component, ~toplevel_getcomponents, interface_161:31);
12+
def_component $component4 = enum(component, component, ~toplevel_getcomponents, interface_161:32);
1313
if ($component4 = null) {
1414
$component4 = interface_228:0;
1515
}

‎scripts/[clientscript,death_deathkeepinit].cs2

-4
This file was deleted.

‎scripts/[clientscript,deathkeep_infomessage].cs2

-15
This file was deleted.

‎scripts/[clientscript,deathkeep_invtransmit].cs2

-3
This file was deleted.

‎scripts/[clientscript,gravestone_retrieval_init].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[clientscript,gravestone_retrieval_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9)
33
def_int $int10 = ~steelborder($component1, "", 0);
44
~gravestone_retrieval_unlockstatus($component1, $int10, $component4, $component5, $component8, $component9);
5-
if_setonvartransmit("gravestone_retrieval_unlockstatus($component1, $int10, $component4, $component5, $component8, $component9){var261}", $component0);
5+
if_setonvartransmit("gravestone_retrieval_unlockstatus($component1, $int10, $component4, $component5, $component8, $component9){var261, var262}", $component0);
66
if_setgraphic("miscgraphics,0", $component6);
77
if_setop(1, "Discard-All", $component6);
88
if_setontimer(null, $component6);
@@ -13,7 +13,7 @@ def_int $int11 = calc(36 + 10);
1313
def_int $int12 = calc(32 + 8);
1414
cc_deleteall($component2);
1515
def_int $int13 = 0;
16-
while ($int13 < 90) {
16+
while ($int13 < 120) {
1717
cc_create($component2, ^iftype_graphic, $int13);
1818
cc_setsize(36, 32, ^setsize_abs, ^setsize_abs);
1919
cc_setposition(calc(1 + (($int13 % 8) * $int11)), calc(3 + (($int13 / 8) * $int12)), ^setpos_abs_left, ^setpos_abs_top);

‎scripts/[clientscript,interface_inv_init].cs2

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// 149
22
[clientscript,interface_inv_init](component $component0, inv $inv1, int $int2, int $int3, int $int4, component $component5, string $string0, string $string1, string $string2, string $string3, string $string4)
3-
~interface_inv_update_big($component0, $inv1, $int2, $int3, $int4, $component5, $string0, $string1, $string2, $string3, $string4, "null", "null", "null", "null");
4-
if_setoninvtransmit("interface_inv_update_big($component0, $inv1, $int2, $int3, $int4, $component5, $string0, $string1, $string2, $string3, $string4, "null", "null", "null", "null"){$inv1}", $component0);
3+
def_string $string5 = "";
4+
~interface_inv_update_big($component0, $inv1, $int2, $int3, $int4, $component5, $string0, $string1, $string2, $string3, $string4, $string5, $string5, $string5, $string5);
5+
if_setoninvtransmit("interface_inv_update_big($component0, $inv1, $int2, $int3, $int4, $component5, $string0, $string1, $string2, $string3, $string4, $string5, $string5, $string5, $string5){$inv1}", $component0);

‎scripts/[clientscript,interface_invother_init].cs2

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// 158
22
[clientscript,interface_invother_init](component $component0, inv $inv1, int $int2, int $int3, int $int4, component $component5, boolean $boolean6, string $string0, string $string1, string $string2, string $string3, string $string4)
3-
~interface_invother_update_big($component0, $inv1, $int2, $int3, $int4, $component5, $string0, $string1, $string2, $string3, $string4, "null", "null", "null", "null", $boolean6);
4-
if_setoninvtransmit("interface_invother_update_big($component0, $inv1, $int2, $int3, $int4, $component5, $string0, $string1, $string2, $string3, $string4, "null", "null", "null", "null", $boolean6){$inv1}", $component0);
3+
def_string $string5 = "";
4+
~interface_invother_update_big($component0, $inv1, $int2, $int3, $int4, $component5, $string0, $string1, $string2, $string3, $string4, $string5, $string5, $string5, $string5, $boolean6);
5+
if_setoninvtransmit("interface_invother_update_big($component0, $inv1, $int2, $int3, $int4, $component5, $string0, $string1, $string2, $string3, $string4, $string5, $string5, $string5, $string5, $boolean6){$inv1}", $component0);

‎scripts/[clientscript,raids_sidepanel_addline].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 1548
22
[clientscript,raids_sidepanel_addline](int $int0, string $string0)
3-
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:72)) = false) {
3+
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:73)) = false) {
44
return;
55
}
66
if (string_length($string0) <= 0) {

‎scripts/[clientscript,raids_sidepanel_initlines].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// 1547
22
[clientscript,raids_sidepanel_initlines](int $int0)
3-
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:72)) = false) {
3+
if (if_hassub(enum(component, component, ~toplevel_getcomponents, interface_161:73)) = false) {
44
return;
55
}
66
cc_deleteall(interface_500:10);

‎scripts/[clientscript,tob_hud_nameflasher].cs2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 2302
22
[clientscript,tob_hud_nameflasher](component $component0)
3-
~tob_hud_nameflasher($component0);
3+
if_setcolour(~tob_hud_nameflasher, $component0);

‎scripts/[clientscript,toplevel_init].cs2

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
[clientscript,toplevel_init](component $component0, enum $enum1)
33
if_setonsubchange("toplevel_subchange(event_com, $enum1)", $component0);
44
if_setonresize("toplevel_resize(event_com, $enum1)", $component0);
5-
if_setonvartransmit("toplevel_vartransmit(event_com, $enum1){var1021, var1055, var1734, var1431, var1227, var439, var1141, var1795}", $component0);
5+
if_setonvartransmit("toplevel_vartransmit(event_com, $enum1){var1021, var1055, var1734, var1431, var1227, var439, var1141, var1795, var1697}", $component0);
66
def_int $int2 = 0;
77
def_component $component3 = enum(int, component, enum_1138, $int2);
88
while ($component3 ! null) {
@@ -18,7 +18,7 @@ if ((%varcint171 <= 0) & (enum(enum, boolean, enum_1134, $enum1) = false)) {
1818
%varcint171 = 3;
1919
}
2020
%varcint172, %varcint173 = null, -1;
21-
$component3 = enum(component, component, $enum1, interface_161:28);
21+
$component3 = enum(component, component, $enum1, interface_161:29);
2222
if ($component3 ! null) {
2323
cc_deleteall($component3);
2424
cc_create($component3, ^iftype_text, 0);
@@ -48,8 +48,8 @@ if ($enum1 = enum_139) {
4848
~script1490(interface_601:6);
4949
~script1490(interface_601:14);
5050
~script2249(interface_601:11, setbit(0, 3));
51-
~script868(interface_601:30);
52-
~script957(interface_601:31);
51+
~script868(interface_601:31);
52+
~script957(interface_601:32);
5353
} else {
5454
setshowmouseovertext(true);
5555
setshowmousecross(true);
@@ -61,6 +61,7 @@ if ($enum1 = enum_139) {
6161
~account_update_display;
6262
~script3173(enum(component, component, $enum1, interface_161:5));
6363
~notification_init(enum(component, component, $enum1, interface_161:7));
64+
~script3457(enum(component, component, $enum1, interface_161:19));
6465
~toplevel_redraw($component0, $enum1);
6566
~toplevel_subchange($component0, $enum1);
6667
~toplevel_sidebutton_switch(%varcint171, $enum1);

‎scripts/[clientscript,worldmap_init].cs2

+10-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ if (~toplevel_getcomponents ! enum_1132) {
3535
def_int $int26 = calc((4 + 1) * 21);
3636
if_setsize(0, $int26, ^setsize_minus, ^setsize_minus, $component20);
3737
if_setsize(6, $int26, ^setsize_minus, ^setsize_abs, $component10);
38-
def_int $intarray0(calc(~max(106, 37) + 1));
38+
def_int $intarray0(~max(enum_getoutputcount(enum_1705), calc(37 + 1)));
3939
cc_deleteall($component21);
4040
$int25 = 0;
4141
def_int $int27 = 16;
@@ -83,7 +83,7 @@ while ($category30 ! null) {
8383
$category30 = enum(int, category, enum_1705, $int28);
8484
}
8585
if ($int28 >= 2) {
86-
~worldmap_keysort(intarray0, $component21, 0, 106);
86+
~worldmap_keysort(intarray0, $component21, 0, calc(enum_getoutputcount(enum_1705) - 1));
8787
}
8888
$int29 = calc($int29 + 18);
8989
def_int $int31 = -1;
@@ -312,12 +312,18 @@ while ($maparea45 ! null) {
312312
}
313313
$maparea45 = enum(int, maparea, enum_1697, $int28);
314314
}
315-
def_int $int46 = $int25;
315+
def_coord $coord46 = movecoord(0_0_0_0_0, $int25, 0, 0);
316316
cc_create($component16, ^iftype_graphic, $int25);
317317
$int25 = calc($int25 + 1);
318318
cc_setsize(17, 17, ^setsize_abs, ^setsize_abs);
319319
cc_sethide(true);
320320
cc_setgraphic(struct_param(struct_1, param_459));
321+
$coord46 = movecoord($coord46, 0, 0, $int25);
322+
cc_create($component16, ^iftype_graphic, $int25);
323+
$int25 = calc($int25 + 1);
324+
cc_setsize(17, 17, ^setsize_abs, ^setsize_abs);
325+
cc_sethide(true);
326+
cc_setgraphic(struct_param(struct_317, param_459));
321327
if ($int28 >= 3) {
322328
~quicksort_cctext(intarray0, $component16, 1, 37);
323329
}
@@ -366,7 +372,7 @@ cc_setsize(0, 0, ^setsize_minus, ^setsize_minus);
366372
cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre);
367373
cc_setgraphic("tradebacking");
368374
cc_settiling(true);
369-
cc_setonclick("worldmap_maplist_open($component12, $component13, $component16, $int46)");
375+
cc_setonclick("worldmap_maplist_open($component12, $component13, $component16, coordx($coord46), coordz($coord46))");
370376
if_setonclick("worldmap_maplist_close($component12, $component13)", $component14);
371377
cc_create($component12, ^iftype_rectangle, $int25);
372378
$int25 = calc($int25 + 1);

‎scripts/[clientscript,worldmap_maplist_open].cs2

+44-14
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,55 @@
11
// 1708
2-
[clientscript,worldmap_maplist_open](component $component0, component $component1, component $component2, int $int3)
2+
[clientscript,worldmap_maplist_open](component $component0, component $component1, component $component2, int $int3, int $int4)
33
sound_synth(synth_2266, 1, 0);
44
~xpdrops_setup_display_hoverdisable($component0);
55
if_sethide(false, $component1);
6-
def_int $int4 = 0;
7-
def_maparea $maparea5 = null;
8-
while ($int4 <= 37) {
9-
$maparea5 = enum(int, maparea, enum_1697, $int4);
10-
if (((($maparea5 ! null) & (cc_find($component2, calc($int4 + 1)) = ^true)) & ($int3 ! -1)) & (~worldmap_findcoordinmap($maparea5, %varcint188) ! null)) {
11-
if (.cc_find($component2, $int3) = ^true) {
12-
.cc_sethide(false);
6+
def_int $int5 = ^min_32bit_int;
7+
def_int $int6 = ^min_32bit_int;
8+
def_int $int7 = 0;
9+
def_maparea $maparea8 = null;
10+
while ($int7 <= 37) {
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) {
14+
if (~on_mobile = false) {
15+
$int5 = calc(cc_gety - 1);
16+
} else {
17+
$int5 = calc(cc_gety + 3);
18+
}
19+
}
20+
if (~worldmap_findcoordinmap($maparea8, %varcint401) ! null) {
1321
if (~on_mobile = false) {
14-
.cc_setposition(1, calc(cc_gety - 1), ^setpos_abs_left, ^setpos_abs_top);
22+
$int6 = calc(cc_gety - 1);
1523
} else {
16-
.cc_setposition(1, calc(cc_gety + 3), ^setpos_abs_left, ^setpos_abs_top);
24+
$int6 = calc(cc_gety + 3);
1725
}
1826
}
19-
$int3 = -1;
2027
}
21-
$int4 = calc($int4 + 1);
28+
$int7 = calc($int7 + 1);
2229
}
23-
if (($int3 ! -1) & (cc_find($component2, $int3) = ^true)) {
24-
cc_sethide(true);
30+
if ((cc_find($component2, $int3) = ^true) & (.cc_find($component2, $int4) = ^true)) {
31+
if ($int5 ! ^min_32bit_int) {
32+
if ($int6 ! ^min_32bit_int) {
33+
cc_sethide(false);
34+
.cc_sethide(false);
35+
if ($int5 = $int6) {
36+
cc_setposition(0, $int5, ^setpos_abs_left, ^setpos_abs_top);
37+
.cc_setposition(3, $int6, ^setpos_abs_left, ^setpos_abs_top);
38+
} else {
39+
cc_setposition(1, $int5, ^setpos_abs_left, ^setpos_abs_top);
40+
.cc_setposition(1, $int6, ^setpos_abs_left, ^setpos_abs_top);
41+
}
42+
} else {
43+
cc_sethide(false);
44+
.cc_sethide(true);
45+
cc_setposition(1, $int5, ^setpos_abs_left, ^setpos_abs_top);
46+
}
47+
} else if ($int6 ! ^min_32bit_int) {
48+
cc_sethide(true);
49+
.cc_sethide(false);
50+
.cc_setposition(1, $int6, ^setpos_abs_left, ^setpos_abs_top);
51+
} else {
52+
cc_sethide(true);
53+
.cc_sethide(true);
54+
}
2555
}

‎scripts/[clientscript,worldmap_maplist_select].cs2

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,11 @@ if ($int0 ! 1) {
66
sound_synth(synth_2266, 1, 0);
77
~worldmap_maplist_close($component2, $component3);
88
if ((worldmap_getcurrentmap ! $maparea1) & (cc_find($component2, 4) = ^true)) {
9-
~worldmap_loadmap($maparea1, %varcint188, $component2, $component3, $component4, $component5, $component6, $component7, $component8);
9+
if (~worldmap_findcoordinmap($maparea1, %varcint188) ! null) {
10+
~worldmap_loadmap($maparea1, %varcint188, $component2, $component3, $component4, $component5, $component6, $component7, $component8);
11+
} else if (~worldmap_findcoordinmap($maparea1, %varcint401) ! null) {
12+
~worldmap_loadmap($maparea1, %varcint401, $component2, $component3, $component4, $component5, $component6, $component7, $component8);
13+
} else {
14+
~worldmap_loadmap($maparea1, null, $component2, $component3, $component4, $component5, $component6, $component7, $component8);
15+
}
1016
}

‎scripts/[clientscript,worldmap_transmitdata].cs2

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// 1749
2-
[clientscript,worldmap_transmitdata](coord $coord0)
3-
%varcint188 = $coord0;
2+
[clientscript,worldmap_transmitdata](coord $coord0, coord $coord1)
3+
%varcint188, %varcint401 = $coord0, $coord1;

0 commit comments

Comments
 (0)