From 6469ac8f02ffda393c0c3cdf2022ad5ccab74e73 Mon Sep 17 00:00:00 2001 From: Joshua Filby Date: Thu, 18 May 2023 16:16:32 -0500 Subject: [PATCH] Update names --- README.md | 120 ++++---- .../[clientscript,add_overlaytimer_loc].cs2 | 4 +- .../[clientscript,bugreport_textinput].cs2 | 6 +- ....cs2 => [clientscript,cabbage_lookup].cs2} | 2 +- ...[clientscript,cannon_overlay_transmit].cs2 | 2 +- ...ript,cc_graphic_swapper_entityoverlay].cs2 | 8 + scripts/[clientscript,chatbox_open_input].cs2 | 2 +- scripts/[clientscript,chattimestamp].cs2 | 4 +- ...entscript,cluehelper_clear_highlights].cs2 | 8 +- ...script,cluehelper_key_npc_invtransmit].cs2 | 2 +- ...script,cluehelper_key_npc_vartransmit].cs2 | 4 +- ...cript,cluehelper_overlay_dig_transmit].cs2 | 4 +- ...ript,cluehelper_overlay_loc_transmit].cs2} | 6 +- ...entscript,cluehelper_overlay_mappost].cs2} | 2 +- scripts/[clientscript,fade_component].cs2 | 3 + .../[clientscript,fade_component_update].cs2 | 3 + scripts/[clientscript,fade_overlay].cs2 | 2 +- .../[clientscript,fade_overlay_specific].cs2 | 3 + ...t,fishing_spot_indicator_stattransmit].cs2 | 2 +- ...pt,fishing_spot_indicator_vartransmit].cs2 | 2 +- .../[clientscript,ground_items_confirm].cs2 | 3 + ...=> [clientscript,ground_items_filter].cs2} | 8 +- ...ientscript,ground_items_focus_changed].cs2 | 10 + ...[clientscript,ground_items_highlight].cs2} | 8 +- scripts/[clientscript,ground_items_init].cs2 | 3 + scripts/[clientscript,ground_items_key].cs2 | 5 + .../[clientscript,ground_items_toggle_op].cs2 | 4 + ...ntscript,ground_items_toggle_transmit].cs2 | 3 + .../[clientscript,ground_items_transmit].cs2 | 3 + ...entscript,helper_agility_stattransmit].cs2 | 2 +- ...ientscript,helper_agility_vartransmit].cs2 | 2 +- ...t,loadnpc_cluehelper_generic_transmit].cs2 | 2 +- ...cript,loadnpc_cluehelper_uri_transmit].cs2 | 4 +- .../[clientscript,logout_timer_notifier].cs2 | 2 +- ....cs2 => [clientscript,loottools_init].cs2} | 6 +- scripts/[clientscript,loottools_size].cs2 | 3 + .../[clientscript,loottracker_clear_data].cs2 | 5 + ... [clientscript,makeover_hover_colour].cs2} | 2 +- ...=> [clientscript,makeover_hover_item].cs2} | 2 +- ...clientscript,makeover_info_mouseleave].cs2 | 5 + ...clientscript,makeover_info_mouseover].cs2} | 2 +- scripts/[clientscript,makeover_init].cs2 | 16 ++ ... => [clientscript,makeover_op_colour].cs2} | 2 +- ...s2 => [clientscript,makeover_op_item].cs2} | 2 +- .../[clientscript,makeover_size_check].cs2 | 3 + ...].cs2 => [clientscript,makeover_spin].cs2} | 2 +- ...ipt,membership_benefits_prompt_banner].cs2 | 8 +- scripts/[clientscript,npc_name_timer].cs2 | 2 +- .../[clientscript,npc_name_vartransmit].cs2 | 2 +- .../[clientscript,overlaytimer_loc_find].cs2 | 4 +- .../[clientscript,overlaytimer_update].cs2 | 8 +- ...ipt,popout_tooltip_clear_clientscript].cs2 | 3 + .../[clientscript,quickprayer_button_op].cs2 | 6 +- ....cs2 => [clientscript,runweight_init].cs2} | 4 +- scripts/[clientscript,screen_glow_fadein].cs2 | 4 +- .../[clientscript,screen_glow_fadeout].cs2 | 4 +- scripts/[clientscript,screen_glow_start].cs2 | 6 +- scripts/[clientscript,script1846].cs2 | 2 +- scripts/[clientscript,script2352].cs2 | 2 +- scripts/[clientscript,script2568].cs2 | 2 +- scripts/[clientscript,script4625].cs2 | 2 +- scripts/[clientscript,script4626].cs2 | 2 +- scripts/[clientscript,script4627].cs2 | 2 +- scripts/[clientscript,script4628].cs2 | 2 +- scripts/[clientscript,script4629].cs2 | 2 +- scripts/[clientscript,script4630].cs2 | 2 +- scripts/[clientscript,script4631].cs2 | 2 +- scripts/[clientscript,script4632].cs2 | 2 +- scripts/[clientscript,script4633].cs2 | 2 +- scripts/[clientscript,script4634].cs2 | 2 +- scripts/[clientscript,script4635].cs2 | 2 +- scripts/[clientscript,script4636].cs2 | 2 +- scripts/[clientscript,script4637].cs2 | 2 +- scripts/[clientscript,script4638].cs2 | 2 +- scripts/[clientscript,script4639].cs2 | 2 +- scripts/[clientscript,script4640].cs2 | 2 +- scripts/[clientscript,script4641].cs2 | 2 +- scripts/[clientscript,script4642].cs2 | 2 +- scripts/[clientscript,script4643].cs2 | 2 +- scripts/[clientscript,script4644].cs2 | 2 +- scripts/[clientscript,script4645].cs2 | 2 +- scripts/[clientscript,script4646].cs2 | 6 +- scripts/[clientscript,script4647].cs2 | 6 +- scripts/[clientscript,script4762].cs2 | 6 +- scripts/[clientscript,script4763].cs2 | 4 +- scripts/[clientscript,script4764].cs2 | 2 +- scripts/[clientscript,script5547].cs2 | 3 - scripts/[clientscript,script5721].cs2 | 2 +- scripts/[clientscript,script5967].cs2 | 4 +- scripts/[clientscript,script6499].cs2 | 2 +- scripts/[clientscript,script6502].cs2 | 4 +- scripts/[clientscript,script6508].cs2 | 2 +- scripts/[clientscript,script6529].cs2 | 4 +- scripts/[clientscript,script6530].cs2 | 4 +- scripts/[clientscript,script6531].cs2 | 4 +- scripts/[clientscript,script6544].cs2 | 2 +- scripts/[clientscript,script6560].cs2 | 8 +- scripts/[clientscript,script6677].cs2 | 2 +- scripts/[clientscript,script6678].cs2 | 2 +- scripts/[clientscript,script6686].cs2 | 4 +- scripts/[clientscript,script6688].cs2 | 2 +- scripts/[clientscript,script6689].cs2 | 6 +- scripts/[clientscript,script6776].cs2 | 16 -- scripts/[clientscript,script7033].cs2 | 8 +- scripts/[clientscript,script7057].cs2 | 3 - scripts/[clientscript,script7059].cs2 | 3 - scripts/[clientscript,script7061].cs2 | 3 - scripts/[clientscript,script7069].cs2 | 2 +- scripts/[clientscript,script7082].cs2 | 2 +- scripts/[clientscript,script7089].cs2 | 5 - scripts/[clientscript,script7090].cs2 | 3 - scripts/[clientscript,script7102].cs2 | 16 +- scripts/[clientscript,script7121].cs2 | 8 - scripts/[clientscript,script7130].cs2 | 2 +- scripts/[clientscript,script7131].cs2 | 3 - scripts/[clientscript,script7179].cs2 | 6 +- scripts/[clientscript,script7181].cs2 | 2 +- scripts/[clientscript,script7189].cs2 | 5 - scripts/[clientscript,script7191].cs2 | 4 +- scripts/[clientscript,script7192].cs2 | 2 +- scripts/[clientscript,script7193].cs2 | 4 +- scripts/[clientscript,script7194].cs2 | 2 +- scripts/[clientscript,script7195].cs2 | 4 +- scripts/[clientscript,script7196].cs2 | 2 +- scripts/[clientscript,script7197].cs2 | 4 +- scripts/[clientscript,script7198].cs2 | 2 +- scripts/[clientscript,script7205].cs2 | 3 - scripts/[clientscript,script7207].cs2 | 4 - scripts/[clientscript,script7208].cs2 | 3 - scripts/[clientscript,script7214].cs2 | 3 - scripts/[clientscript,script7215].cs2 | 10 - scripts/[clientscript,script7220].cs2 | 7 - scripts/[clientscript,script7229].cs2 | 3 - scripts/[clientscript,script7230].cs2 | 5 - scripts/[clientscript,script7231].cs2 | 4 +- scripts/[clientscript,script7235].cs2 | 4 +- scripts/[clientscript,script876].cs2 | 2 +- ...ientscript,settings_interface_scaling].cs2 | 2 +- ...clientscript,settings_meslayer_close].cs2} | 2 +- ...lientscript,settings_minimap_zoom_op].cs2} | 2 +- scripts/[clientscript,smokeoverlay_init].cs2 | 6 +- ...[clientscript,steam_lock_achievements].cs2 | 48 ++-- ...ientscript,toa_partydetails_addmember].cs2 | 4 +- ...ntscript,toa_partydetails_sortmember].cs2} | 2 +- scripts/[clientscript,toplevel_init].cs2 | 4 +- scripts/[clientscript,worldmap_init].cs2 | 2 +- .../[clientscript,worldmap_search_start].cs2 | 2 +- scripts/[proc,add_overlaytimer_coord].cs2 | 2 +- scripts/[proc,add_overlaytimer_inner].cs2 | 8 +- scripts/[proc,add_overlaytimer_loc].cs2 | 2 +- scripts/[proc,add_overlaytimer_npc].cs2 | 2 +- scripts/[proc,blast_furnace_highlights].cs2 | 8 +- scripts/[proc,br_fogcolour].cs2 | 4 +- scripts/[proc,cannon_overlay].cs2 | 4 +- scripts/[proc,cannon_overlay_create].cs2 | 6 +- ...oc,cluehelper_highlight_channel_setup].cs2 | 14 +- scripts/[proc,cluehelper_key_npc].cs2 | 2 +- scripts/[proc,cluehelper_key_npc_draw].cs2 | 6 +- scripts/[proc,cluehelper_overlay].cs2 | 8 +- .../[proc,cluehelper_overlay_dig_draw].cs2 | 14 +- .../[proc,cluehelper_overlay_loc_draw].cs2 | 29 ++ scripts/[proc,cluehelper_uri_overlay].cs2 | 4 +- scripts/[proc,deadman_spectator_names].cs2 | 6 +- .../[proc,deadman_tournament_fogcolour].cs2 | 6 +- scripts/[proc,entity_highlight_clear].cs2 | 8 +- scripts/[proc,entity_highlight_minimenu].cs2 | 26 +- scripts/[proc,entity_highlight_setup].cs2 | 8 +- scripts/[proc,fade_component].cs2 | 19 ++ ...s2 => [proc,fade_component_increment].cs2} | 2 +- ...cript7058].cs2 => [proc,fade_overlay].cs2} | 2 +- .../[proc,fishing_spot_indicator_create].cs2 | 8 +- ...roc,fishing_spot_indicator_tile_setup].cs2 | 8 +- ...206].cs2 => [proc,ground_items_build].cs2} | 6 +- scripts/[proc,ground_items_clear_vector].cs2 | 7 + .../[proc,ground_items_custom_highlight].cs2 | 7 + scripts/[proc,ground_items_display].cs2 | 7 + ...236].cs2 => [proc,ground_items_price].cs2} | 2 +- ...227].cs2 => [proc,ground_items_setup].cs2} | 36 +-- ...2 => [proc,ground_items_toggle_synch].cs2} | 2 +- ...[proc,helper_agility_highlight_course].cs2 | 6 +- ...oc,helper_agility_highlight_obstacles].cs2 | 20 +- .../[proc,helper_agility_highlight_setup].cs2 | 8 +- scripts/[proc,helper_generic_setup].cs2 | 2 +- ...proc,herbiboar_helper_highlight_clear].cs2 | 10 +- ...oc,herbiboar_helper_highlight_disable].cs2 | 10 +- ...roc,herbiboar_helper_highlight_enable].cs2 | 26 +- scripts/[proc,highlighting_off].cs2 | 272 +++++++++--------- ...script7120].cs2 => [proc,if_subcount].cs2} | 2 +- scripts/[proc,keyboard_show_string].cs2 | 4 +- scripts/[proc,loadnpc_cluehelper_generic].cs2 | 2 +- ...proc,loadnpc_cluehelper_generic_setup].cs2 | 4 +- .../[proc,loadnpc_cluehelper_uri_overlay].cs2 | 4 +- scripts/[proc,local_notification].cs2 | 2 +- ...ipt7132].cs2 => [proc,loottools_size].cs2} | 2 +- ...7190].cs2 => [proc,loottracker_login].cs2} | 2 +- ....cs2 => [proc,loottracker_value_item].cs2} | 2 +- ...s2 => [proc,makeover_create_dropdown].cs2} | 10 +- ...].cs2 => [proc,makeover_draw_colours].cs2} | 8 +- scripts/[proc,makeover_draw_content].cs2 | 7 + ...073].cs2 => [proc,makeover_draw_item].cs2} | 8 +- ...72].cs2 => [proc,makeover_draw_items].cs2} | 4 +- ...cs2 => [proc,makeover_draw_scrollbar].cs2} | 2 +- ...=> [proc,makeover_draw_select_button].cs2} | 2 +- ...91].cs2 => [proc,makeover_size_check].cs2} | 6 +- scripts/[proc,mouseover_entity_highlight].cs2 | 2 +- scripts/[proc,mouseover_ops].cs2 | 2 +- scripts/[proc,mouseover_tooltip].cs2 | 2 +- scripts/[proc,npc_name_create].cs2 | 10 +- scripts/[proc,npc_name_setup].cs2 | 4 +- scripts/[proc,popout_tooltip_hook_cc].cs2 | 2 +- scripts/[proc,popout_tooltip_hook_if].cs2 | 2 +- scripts/[proc,pvp_icons_layout].cs2 | 8 +- scripts/[proc,quickprayer_button_update].cs2 | 2 +- ...s2 => [proc,quickprayer_selected_get].cs2} | 2 +- ...s2 => [proc,quickprayer_selected_set].cs2} | 2 +- ...t3153].cs2 => [proc,runweight_update].cs2} | 2 +- scripts/[proc,script3721].cs2 | 2 +- scripts/[proc,script4554].cs2 | 6 +- scripts/[proc,script4555].cs2 | 4 +- scripts/[proc,script4648].cs2 | 4 +- scripts/[proc,script4731].cs2 | 8 +- scripts/[proc,script5198].cs2 | 6 +- scripts/[proc,script5204].cs2 | 6 +- scripts/[proc,script5210].cs2 | 10 +- scripts/[proc,script5310].cs2 | 2 +- scripts/[proc,script5355].cs2 | 16 +- scripts/[proc,script5484].cs2 | 8 +- scripts/[proc,script5718].cs2 | 4 +- scripts/[proc,script5724].cs2 | 4 +- scripts/[proc,script5725].cs2 | 4 +- scripts/[proc,script5728].cs2 | 20 +- scripts/[proc,script5936].cs2 | 4 +- scripts/[proc,script5961].cs2 | 2 +- scripts/[proc,script5963].cs2 | 4 +- scripts/[proc,script5965].cs2 | 4 +- scripts/[proc,script5966].cs2 | 4 +- scripts/[proc,script6247].cs2 | 6 +- scripts/[proc,script6498].cs2 | 18 +- scripts/[proc,script6501].cs2 | 14 +- scripts/[proc,script6505].cs2 | 29 -- scripts/[proc,script6507].cs2 | 16 +- scripts/[proc,script6513].cs2 | 4 +- scripts/[proc,script6514].cs2 | 4 +- scripts/[proc,script6515].cs2 | 4 +- scripts/[proc,script6516].cs2 | 4 +- scripts/[proc,script6517].cs2 | 4 +- scripts/[proc,script6533].cs2 | 4 +- scripts/[proc,script6542].cs2 | 4 +- scripts/[proc,script6546].cs2 | 2 +- scripts/[proc,script6558].cs2 | 8 +- scripts/[proc,script6559].cs2 | 20 +- scripts/[proc,script6664].cs2 | 10 +- scripts/[proc,script6671].cs2 | 4 +- scripts/[proc,script6681].cs2 | 8 +- scripts/[proc,script6682].cs2 | 2 +- scripts/[proc,script6687].cs2 | 16 +- scripts/[proc,script6690].cs2 | 12 +- scripts/[proc,script6691].cs2 | 12 +- scripts/[proc,script6692].cs2 | 12 +- scripts/[proc,script6896].cs2 | 2 +- scripts/[proc,script6902].cs2 | 2 +- scripts/[proc,script7034].cs2 | 8 +- scripts/[proc,script7060].cs2 | 19 -- scripts/[proc,script7070].cs2 | 7 - scripts/[proc,script7074].cs2 | 2 +- scripts/[proc,script7083].cs2 | 2 +- scripts/[proc,script7106].cs2 | 2 +- scripts/[proc,script7133].cs2 | 2 +- scripts/[proc,script7160].cs2 | 4 +- scripts/[proc,script7164].cs2 | 4 +- scripts/[proc,script7166].cs2 | 10 +- scripts/[proc,script7170].cs2 | 20 +- scripts/[proc,script7171].cs2 | 4 +- scripts/[proc,script7172].cs2 | 12 +- scripts/[proc,script7199].cs2 | 10 +- scripts/[proc,script7200].cs2 | 8 +- scripts/[proc,script7202].cs2 | 6 +- scripts/[proc,script7203].cs2 | 14 +- scripts/[proc,script7210].cs2 | 10 +- scripts/[proc,script7212].cs2 | 4 +- scripts/[proc,script7213].cs2 | 4 +- scripts/[proc,script7218].cs2 | 2 +- scripts/[proc,script7219].cs2 | 2 +- scripts/[proc,script7221].cs2 | 6 +- scripts/[proc,script7222].cs2 | 4 +- scripts/[proc,script7225].cs2 | 4 +- scripts/[proc,script7232].cs2 | 28 +- scripts/[proc,script7238].cs2 | 7 - scripts/[proc,script7239].cs2 | 7 - scripts/[proc,script7241].cs2 | 2 +- scripts/[proc,script7242].cs2 | 2 +- scripts/[proc,script7243].cs2 | 2 +- scripts/[proc,settings_clicked_toggle].cs2 | 2 +- scripts/[proc,settings_custom_check].cs2 | 2 +- ...].cs2 => [proc,settings_ground_items].cs2} | 2 +- scripts/[proc,settings_logout_notifier].cs2 | 2 +- .../[proc,settings_slider_choose_onop].cs2 | 2 +- scripts/[proc,steam_set_stat_progress].cs2 | 2 +- scripts/[proc,steam_set_unlocked].cs2 | 2 +- scripts/[proc,test_setup_highlights].cs2 | 94 +++--- scripts/[proc,thinbox_entityoverlay].cs2 | 4 +- scripts/[proc,toplevel_redraw].cs2 | 2 +- scripts/[proc,toplevel_resize_customise].cs2 | 16 +- scripts/[proc,wildwars_fogcolour].cs2 | 4 +- scripts/[proc,worldmap_search_off].cs2 | 2 +- scripts/[trigger_45,_].cs2 | 2 +- scripts/[trigger_47,_].cs2 | 8 +- scripts/[trigger_48,_].cs2 | 4 +- scripts/[trigger_49,_].cs2 | 6 +- scripts/[trigger_78,_].cs2 | 2 +- scripts/[trigger_79,_].cs2 | 2 +- scripts/[trigger_80,_].cs2 | 2 +- scripts/[trigger_81,_].cs2 | 2 +- 313 files changed, 1086 insertions(+), 1086 deletions(-) rename scripts/{[clientscript,script7237].cs2 => [clientscript,cabbage_lookup].cs2} (84%) create mode 100644 scripts/[clientscript,cc_graphic_swapper_entityoverlay].cs2 rename scripts/{[clientscript,script6506].cs2 => [clientscript,cluehelper_overlay_loc_transmit].cs2} (51%) rename scripts/{[clientscript,script6495].cs2 => [clientscript,cluehelper_overlay_mappost].cs2} (72%) create mode 100644 scripts/[clientscript,fade_component].cs2 create mode 100644 scripts/[clientscript,fade_component_update].cs2 create mode 100644 scripts/[clientscript,fade_overlay_specific].cs2 create mode 100644 scripts/[clientscript,ground_items_confirm].cs2 rename scripts/{[clientscript,script7234].cs2 => [clientscript,ground_items_filter].cs2} (54%) create mode 100644 scripts/[clientscript,ground_items_focus_changed].cs2 rename scripts/{[clientscript,script7233].cs2 => [clientscript,ground_items_highlight].cs2} (54%) create mode 100644 scripts/[clientscript,ground_items_init].cs2 create mode 100644 scripts/[clientscript,ground_items_key].cs2 create mode 100644 scripts/[clientscript,ground_items_toggle_op].cs2 create mode 100644 scripts/[clientscript,ground_items_toggle_transmit].cs2 create mode 100644 scripts/[clientscript,ground_items_transmit].cs2 rename scripts/{[clientscript,script7128].cs2 => [clientscript,loottools_init].cs2} (81%) create mode 100644 scripts/[clientscript,loottools_size].cs2 create mode 100644 scripts/[clientscript,loottracker_clear_data].cs2 rename scripts/{[clientscript,script7079].cs2 => [clientscript,makeover_hover_colour].cs2} (73%) rename scripts/{[clientscript,script7078].cs2 => [clientscript,makeover_hover_item].cs2} (74%) create mode 100644 scripts/[clientscript,makeover_info_mouseleave].cs2 rename scripts/{[clientscript,script7088].cs2 => [clientscript,makeover_info_mouseover].cs2} (50%) create mode 100644 scripts/[clientscript,makeover_init].cs2 rename scripts/{[clientscript,script7081].cs2 => [clientscript,makeover_op_colour].cs2} (79%) rename scripts/{[clientscript,script7080].cs2 => [clientscript,makeover_op_item].cs2} (79%) create mode 100644 scripts/[clientscript,makeover_size_check].cs2 rename scripts/{[clientscript,script7075].cs2 => [clientscript,makeover_spin].cs2} (90%) create mode 100644 scripts/[clientscript,popout_tooltip_clear_clientscript].cs2 rename scripts/{[clientscript,script2567].cs2 => [clientscript,runweight_init].cs2} (61%) delete mode 100644 scripts/[clientscript,script5547].cs2 delete mode 100644 scripts/[clientscript,script6776].cs2 delete mode 100644 scripts/[clientscript,script7057].cs2 delete mode 100644 scripts/[clientscript,script7059].cs2 delete mode 100644 scripts/[clientscript,script7061].cs2 delete mode 100644 scripts/[clientscript,script7089].cs2 delete mode 100644 scripts/[clientscript,script7090].cs2 delete mode 100644 scripts/[clientscript,script7121].cs2 delete mode 100644 scripts/[clientscript,script7131].cs2 delete mode 100644 scripts/[clientscript,script7189].cs2 delete mode 100644 scripts/[clientscript,script7205].cs2 delete mode 100644 scripts/[clientscript,script7207].cs2 delete mode 100644 scripts/[clientscript,script7208].cs2 delete mode 100644 scripts/[clientscript,script7214].cs2 delete mode 100644 scripts/[clientscript,script7215].cs2 delete mode 100644 scripts/[clientscript,script7220].cs2 delete mode 100644 scripts/[clientscript,script7229].cs2 delete mode 100644 scripts/[clientscript,script7230].cs2 rename scripts/{[clientscript,script7096].cs2 => [clientscript,settings_meslayer_close].cs2} (79%) rename scripts/{[clientscript,script7025].cs2 => [clientscript,settings_minimap_zoom_op].cs2} (66%) rename scripts/{[clientscript,script5345].cs2 => [clientscript,toa_partydetails_sortmember].cs2} (79%) create mode 100644 scripts/[proc,cluehelper_overlay_loc_draw].cs2 create mode 100644 scripts/[proc,fade_component].cs2 rename scripts/{[proc,script7062].cs2 => [proc,fade_component_increment].cs2} (66%) rename scripts/{[proc,script7058].cs2 => [proc,fade_overlay].cs2} (83%) rename scripts/{[proc,script7206].cs2 => [proc,ground_items_build].cs2} (89%) create mode 100644 scripts/[proc,ground_items_clear_vector].cs2 create mode 100644 scripts/[proc,ground_items_custom_highlight].cs2 create mode 100644 scripts/[proc,ground_items_display].cs2 rename scripts/{[proc,script7236].cs2 => [proc,ground_items_price].cs2} (89%) rename scripts/{[proc,script7227].cs2 => [proc,ground_items_setup].cs2} (74%) rename scripts/{[proc,script7209].cs2 => [proc,ground_items_toggle_synch].cs2} (69%) rename scripts/{[proc,script7120].cs2 => [proc,if_subcount].cs2} (71%) rename scripts/{[proc,script7132].cs2 => [proc,loottools_size].cs2} (92%) rename scripts/{[proc,script7190].cs2 => [proc,loottracker_login].cs2} (57%) rename scripts/{[proc,script7178].cs2 => [proc,loottracker_value_item].cs2} (86%) rename scripts/{[proc,script7084].cs2 => [proc,makeover_create_dropdown].cs2} (84%) rename scripts/{[proc,script7077].cs2 => [proc,makeover_draw_colours].cs2} (81%) create mode 100644 scripts/[proc,makeover_draw_content].cs2 rename scripts/{[proc,script7073].cs2 => [proc,makeover_draw_item].cs2} (84%) rename scripts/{[proc,script7072].cs2 => [proc,makeover_draw_items].cs2} (83%) rename scripts/{[proc,script7071].cs2 => [proc,makeover_draw_scrollbar].cs2} (91%) rename scripts/{[proc,script7068].cs2 => [proc,makeover_draw_select_button].cs2} (93%) rename scripts/{[proc,script7091].cs2 => [proc,makeover_size_check].cs2} (53%) rename scripts/{[proc,script7054].cs2 => [proc,quickprayer_selected_get].cs2} (74%) rename scripts/{[proc,script7055].cs2 => [proc,quickprayer_selected_set].cs2} (70%) rename scripts/{[proc,script3153].cs2 => [proc,runweight_update].cs2} (59%) delete mode 100644 scripts/[proc,script6505].cs2 delete mode 100644 scripts/[proc,script7060].cs2 delete mode 100644 scripts/[proc,script7070].cs2 delete mode 100644 scripts/[proc,script7238].cs2 delete mode 100644 scripts/[proc,script7239].cs2 rename scripts/{[proc,script7112].cs2 => [proc,settings_ground_items].cs2} (74%) diff --git a/README.md b/README.md index a058e72d2..3d2ca16cd 100644 --- a/README.md +++ b/README.md @@ -2567,7 +2567,7 @@ [**2564**](scripts/[clientscript,membership_benefits_close_benefit_hover].cs2) `[clientscript,membership_benefits_close_benefit_hover]` [**2565**](scripts/[clientscript,membership_benefits_close_benefit].cs2) `[clientscript,membership_benefits_close_benefit]` [**2566**](scripts/[clientscript,script2566].cs2) -[**2567**](scripts/[clientscript,script2567].cs2) +[**2567**](scripts/[clientscript,runweight_init].cs2) `[clientscript,runweight_init]` [**2568**](scripts/[clientscript,script2568].cs2) [**2569**](scripts/[proc,membership_benefits_prompt_button_init].cs2) `[proc,membership_benefits_prompt_button_init]` [**2570**](scripts/[clientscript,membership_benefits_prompt_button_draw].cs2) `[clientscript,membership_benefits_prompt_button_draw]` @@ -3153,7 +3153,7 @@ [**3150**](scripts/[proc,script3150].cs2) [**3151**](scripts/[clientscript,boardgames_draughts_options_update_selections].cs2) `[clientscript,boardgames_draughts_options_update_selections]` [**3152**](scripts/[proc,boardgames_draughts_options_update_selections].cs2) `[proc,boardgames_draughts_options_update_selections]` -[**3153**](scripts/[proc,script3153].cs2) +[**3153**](scripts/[proc,runweight_update].cs2) `[proc,runweight_update]` [**3154**](scripts/[proc,script3154].cs2) [**3155**](scripts/[clientscript,script3155].cs2) [**3156**](scripts/[proc,script3156].cs2) @@ -5345,7 +5345,7 @@ [**5342**](scripts/[proc,script5342].cs2) [**5343**](scripts/[proc,script5343].cs2) [**5344**](scripts/[proc,script5344].cs2) -[**5345**](scripts/[clientscript,script5345].cs2) +[**5345**](scripts/[clientscript,toa_partydetails_sortmember].cs2) `[clientscript,toa_partydetails_sortmember]` [**5346**](scripts/[proc,script5346].cs2) [**5347**](scripts/[proc,script5347].cs2) [**5348**](scripts/[proc,helper_generic_set_bit].cs2) `[proc,helper_generic_set_bit]` @@ -5547,7 +5547,7 @@ [**5544**](scripts/[proc,script5544].cs2) [**5545**](scripts/[clientscript,popout_tooltip_remove_delayed].cs2) `[clientscript,popout_tooltip_remove_delayed]` [**5546**](scripts/[proc,popout_tooltip_clear].cs2) `[proc,popout_tooltip_clear]` -[**5547**](scripts/[clientscript,script5547].cs2) +[**5547**](scripts/[clientscript,popout_tooltip_clear_clientscript].cs2) `[clientscript,popout_tooltip_clear_clientscript]` [**5548**](scripts/[proc,pvpa_world].cs2) `[proc,pvpa_world]` [**5549**](scripts/[clientscript,script5549].cs2) [**5550**](scripts/[clientscript,stat_boosts_hud_mobile_tooltip].cs2) `[clientscript,stat_boosts_hud_mobile_tooltip]` @@ -6495,7 +6495,7 @@ [**6492**](scripts/[proc,cluehelper_highlight_channel_setup].cs2) `[proc,cluehelper_highlight_channel_setup]` [**6493**](scripts/[clientscript,cluehelper_clear_highlights].cs2) `[clientscript,cluehelper_clear_highlights]` [**6494**](scripts/[clientscript,cluehelper_overlay_vartransmit].cs2) `[clientscript,cluehelper_overlay_vartransmit]` -[**6495**](scripts/[clientscript,script6495].cs2) +[**6495**](scripts/[clientscript,cluehelper_overlay_mappost].cs2) `[clientscript,cluehelper_overlay_mappost]` [**6496**](scripts/[proc,cluehelper_overlay].cs2) `[proc,cluehelper_overlay]` [**6497**](scripts/[proc,cluehelper_overlay_npc_active].cs2) `[proc,cluehelper_overlay_npc_active]` [**6498**](scripts/[proc,script6498].cs2) @@ -6505,8 +6505,8 @@ [**6502**](scripts/[clientscript,script6502].cs2) [**6503**](scripts/[proc,cluehelper_overlay_dig_draw].cs2) `[proc,cluehelper_overlay_dig_draw]` [**6504**](scripts/[clientscript,cluehelper_overlay_dig_transmit].cs2) `[clientscript,cluehelper_overlay_dig_transmit]` -[**6505**](scripts/[proc,script6505].cs2) -[**6506**](scripts/[clientscript,script6506].cs2) +[**6505**](scripts/[proc,cluehelper_overlay_loc_draw].cs2) `[proc,cluehelper_overlay_loc_draw]` +[**6506**](scripts/[clientscript,cluehelper_overlay_loc_transmit].cs2) `[clientscript,cluehelper_overlay_loc_transmit]` [**6507**](scripts/[proc,script6507].cs2) [**6508**](scripts/[clientscript,script6508].cs2) [**6509**](scripts/[clientscript,br_loadout_settabs].cs2) `[clientscript,br_loadout_settabs]` @@ -6775,7 +6775,7 @@ [**6772**](scripts/[clientscript,toa_scoreboard_tab_update].cs2) `[clientscript,toa_scoreboard_tab_update]` [**6773**](scripts/[proc,toa_scoreboard_tab_update].cs2) `[proc,toa_scoreboard_tab_update]` [**6774**](scripts/[clientscript,toa_scoreboard_tab_select].cs2) `[clientscript,toa_scoreboard_tab_select]` -[**6776**](scripts/[clientscript,script6776].cs2) +[**6776**](scripts/[clientscript,makeover_init].cs2) `[clientscript,makeover_init]` [**6777**](scripts/[clientscript,script6777].cs2) [**6778**](scripts/[proc,script6778].cs2) [**6779**](scripts/[proc,script6779].cs2) @@ -7024,7 +7024,7 @@ [**7022**](scripts/[worldmapelementmouserepeat,mapelement_871].cs2) `[worldmapelementmouserepeat,mapelement_871]` [**7023**](scripts/[worldmapelementmouseleave,mapelement_871].cs2) `[worldmapelementmouseleave,mapelement_871]` [**7024**](scripts/[proc,script7024].cs2) -[**7025**](scripts/[clientscript,script7025].cs2) +[**7025**](scripts/[clientscript,settings_minimap_zoom_op].cs2) `[clientscript,settings_minimap_zoom_op]` [**7026**](scripts/[clientscript,settings_minimap_zoom_position_timer].cs2) `[clientscript,settings_minimap_zoom_position_timer]` [**7027**](scripts/[proc,script7027].cs2) [**7028**](scripts/[proc,script7028].cs2) @@ -7053,49 +7053,49 @@ [**7051**](scripts/[clientscript,script7051].cs2) [**7052**](scripts/[clientscript,script7052].cs2) [**7053**](scripts/[proc,script7053].cs2) -[**7054**](scripts/[proc,script7054].cs2) -[**7055**](scripts/[proc,script7055].cs2) +[**7054**](scripts/[proc,quickprayer_selected_get].cs2) `[proc,quickprayer_selected_get]` +[**7055**](scripts/[proc,quickprayer_selected_set].cs2) `[proc,quickprayer_selected_set]` [**7056**](scripts/[proc,script7056].cs2) -[**7057**](scripts/[clientscript,script7057].cs2) -[**7058**](scripts/[proc,script7058].cs2) -[**7059**](scripts/[clientscript,script7059].cs2) -[**7060**](scripts/[proc,script7060].cs2) -[**7061**](scripts/[clientscript,script7061].cs2) -[**7062**](scripts/[proc,script7062].cs2) +[**7057**](scripts/[clientscript,fade_overlay_specific].cs2) `[clientscript,fade_overlay_specific]` +[**7058**](scripts/[proc,fade_overlay].cs2) `[proc,fade_overlay]` +[**7059**](scripts/[clientscript,fade_component].cs2) `[clientscript,fade_component]` +[**7060**](scripts/[proc,fade_component].cs2) `[proc,fade_component]` +[**7061**](scripts/[clientscript,fade_component_update].cs2) `[clientscript,fade_component_update]` +[**7062**](scripts/[proc,fade_component_increment].cs2) `[proc,fade_component_increment]` [**7063**](scripts/[worldmapelementmouserepeat,mapelement_239].cs2) `[worldmapelementmouserepeat,mapelement_239]` [**7064**](scripts/[worldmapelementmouseleave,mapelement_239].cs2) `[worldmapelementmouseleave,mapelement_239]` [**7065**](scripts/[clientscript,script7065].cs2) [**7066**](scripts/[proc,script7066].cs2) [**7067**](scripts/[clientscript,script7067].cs2) -[**7068**](scripts/[proc,script7068].cs2) +[**7068**](scripts/[proc,makeover_draw_select_button].cs2) `[proc,makeover_draw_select_button]` [**7069**](scripts/[clientscript,script7069].cs2) -[**7070**](scripts/[proc,script7070].cs2) -[**7071**](scripts/[proc,script7071].cs2) -[**7072**](scripts/[proc,script7072].cs2) -[**7073**](scripts/[proc,script7073].cs2) +[**7070**](scripts/[proc,makeover_draw_content].cs2) `[proc,makeover_draw_content]` +[**7071**](scripts/[proc,makeover_draw_scrollbar].cs2) `[proc,makeover_draw_scrollbar]` +[**7072**](scripts/[proc,makeover_draw_items].cs2) `[proc,makeover_draw_items]` +[**7073**](scripts/[proc,makeover_draw_item].cs2) `[proc,makeover_draw_item]` [**7074**](scripts/[proc,script7074].cs2) -[**7075**](scripts/[clientscript,script7075].cs2) +[**7075**](scripts/[clientscript,makeover_spin].cs2) `[clientscript,makeover_spin]` [**7076**](scripts/[clientscript,script7076].cs2) -[**7077**](scripts/[proc,script7077].cs2) -[**7078**](scripts/[clientscript,script7078].cs2) -[**7079**](scripts/[clientscript,script7079].cs2) -[**7080**](scripts/[clientscript,script7080].cs2) -[**7081**](scripts/[clientscript,script7081].cs2) +[**7077**](scripts/[proc,makeover_draw_colours].cs2) `[proc,makeover_draw_colours]` +[**7078**](scripts/[clientscript,makeover_hover_item].cs2) `[clientscript,makeover_hover_item]` +[**7079**](scripts/[clientscript,makeover_hover_colour].cs2) `[clientscript,makeover_hover_colour]` +[**7080**](scripts/[clientscript,makeover_op_item].cs2) `[clientscript,makeover_op_item]` +[**7081**](scripts/[clientscript,makeover_op_colour].cs2) `[clientscript,makeover_op_colour]` [**7082**](scripts/[clientscript,script7082].cs2) [**7083**](scripts/[proc,script7083].cs2) -[**7084**](scripts/[proc,script7084].cs2) +[**7084**](scripts/[proc,makeover_create_dropdown].cs2) `[proc,makeover_create_dropdown]` [**7085**](scripts/[proc,script7085].cs2) [**7086**](scripts/[clientscript,script7086].cs2) [**7087**](scripts/[clientscript,script7087].cs2) -[**7088**](scripts/[clientscript,script7088].cs2) -[**7089**](scripts/[clientscript,script7089].cs2) -[**7090**](scripts/[clientscript,script7090].cs2) -[**7091**](scripts/[proc,script7091].cs2) +[**7088**](scripts/[clientscript,makeover_info_mouseover].cs2) `[clientscript,makeover_info_mouseover]` +[**7089**](scripts/[clientscript,makeover_info_mouseleave].cs2) `[clientscript,makeover_info_mouseleave]` +[**7090**](scripts/[clientscript,makeover_size_check].cs2) `[clientscript,makeover_size_check]` +[**7091**](scripts/[proc,makeover_size_check].cs2) `[proc,makeover_size_check]` [**7092**](scripts/[proc,script7092].cs2) [**7093**](scripts/[clientscript,script7093].cs2) [**7094**](scripts/[proc,script7094].cs2) [**7095**](scripts/[clientscript,script7095].cs2) -[**7096**](scripts/[clientscript,script7096].cs2) +[**7096**](scripts/[clientscript,settings_meslayer_close].cs2) `[clientscript,settings_meslayer_close]` [**7097**](scripts/[proc,script7097].cs2) [**7098**](scripts/[proc,script7098].cs2) [**7099**](scripts/[clientscript,script7099].cs2) @@ -7111,7 +7111,7 @@ [**7109**](scripts/[proc,script7109].cs2) [**7110**](scripts/[proc,script7110].cs2) [**7111**](scripts/[proc,script7111].cs2) -[**7112**](scripts/[proc,script7112].cs2) +[**7112**](scripts/[proc,settings_ground_items].cs2) `[proc,settings_ground_items]` [**7113**](scripts/[proc,script7113].cs2) [**7114**](scripts/[proc,script7114].cs2) [**7115**](scripts/[proc,script7115].cs2) @@ -7119,19 +7119,19 @@ [**7117**](scripts/[proc,script7117].cs2) [**7118**](scripts/[proc,script7118].cs2) [**7119**](scripts/[proc,script7119].cs2) -[**7120**](scripts/[proc,script7120].cs2) -[**7121**](scripts/[clientscript,script7121].cs2) +[**7120**](scripts/[proc,if_subcount].cs2) `[proc,if_subcount]` +[**7121**](scripts/[clientscript,cc_graphic_swapper_entityoverlay].cs2) `[clientscript,cc_graphic_swapper_entityoverlay]` [**7122**](scripts/[proc,script7122].cs2) [**7123**](scripts/[proc,script7123].cs2) [**7124**](scripts/[proc,script7124].cs2) [**7125**](scripts/[proc,script7125].cs2) [**7126**](scripts/[proc,script7126].cs2) [**7127**](scripts/[proc,script7127].cs2) -[**7128**](scripts/[clientscript,script7128].cs2) +[**7128**](scripts/[clientscript,loottools_init].cs2) `[clientscript,loottools_init]` [**7129**](scripts/[clientscript,script7129].cs2) [**7130**](scripts/[clientscript,script7130].cs2) -[**7131**](scripts/[clientscript,script7131].cs2) -[**7132**](scripts/[proc,script7132].cs2) +[**7131**](scripts/[clientscript,loottools_size].cs2) `[clientscript,loottools_size]` +[**7132**](scripts/[proc,loottools_size].cs2) `[proc,loottools_size]` [**7133**](scripts/[proc,script7133].cs2) [**7134**](scripts/[clientscript,script7134].cs2) [**7135**](scripts/[proc,script7135].cs2) @@ -7155,7 +7155,7 @@ [**7175**](scripts/[proc,script7175].cs2) [**7176**](scripts/[proc,script7176].cs2) [**7177**](scripts/[proc,script7177].cs2) -[**7178**](scripts/[proc,script7178].cs2) +[**7178**](scripts/[proc,loottracker_value_item].cs2) `[proc,loottracker_value_item]` [**7179**](scripts/[clientscript,script7179].cs2) [**7180**](scripts/[clientscript,script7180].cs2) [**7181**](scripts/[clientscript,script7181].cs2) @@ -7166,8 +7166,8 @@ [**7186**](scripts/[clientscript,script7186].cs2) [**7187**](scripts/[clientscript,script7187].cs2) [**7188**](scripts/[proc,script7188].cs2) -[**7189**](scripts/[clientscript,script7189].cs2) -[**7190**](scripts/[proc,script7190].cs2) +[**7189**](scripts/[clientscript,loottracker_clear_data].cs2) `[clientscript,loottracker_clear_data]` +[**7190**](scripts/[proc,loottracker_login].cs2) `[proc,loottracker_login]` [**7191**](scripts/[clientscript,script7191].cs2) [**7192**](scripts/[clientscript,script7192].cs2) [**7193**](scripts/[clientscript,script7193].cs2) @@ -7182,41 +7182,41 @@ [**7202**](scripts/[proc,script7202].cs2) [**7203**](scripts/[proc,script7203].cs2) [**7204**](scripts/[proc,script7204].cs2) -[**7205**](scripts/[clientscript,script7205].cs2) -[**7206**](scripts/[proc,script7206].cs2) -[**7207**](scripts/[clientscript,script7207].cs2) -[**7208**](scripts/[clientscript,script7208].cs2) -[**7209**](scripts/[proc,script7209].cs2) +[**7205**](scripts/[clientscript,ground_items_init].cs2) `[clientscript,ground_items_init]` +[**7206**](scripts/[proc,ground_items_build].cs2) `[proc,ground_items_build]` +[**7207**](scripts/[clientscript,ground_items_toggle_op].cs2) `[clientscript,ground_items_toggle_op]` +[**7208**](scripts/[clientscript,ground_items_toggle_transmit].cs2) `[clientscript,ground_items_toggle_transmit]` +[**7209**](scripts/[proc,ground_items_toggle_synch].cs2) `[proc,ground_items_toggle_synch]` [**7210**](scripts/[proc,script7210].cs2) [**7211**](scripts/[clientscript,script7211].cs2) [**7212**](scripts/[proc,script7212].cs2) [**7213**](scripts/[proc,script7213].cs2) -[**7214**](scripts/[clientscript,script7214].cs2) -[**7215**](scripts/[clientscript,script7215].cs2) +[**7214**](scripts/[clientscript,ground_items_confirm].cs2) `[clientscript,ground_items_confirm]` +[**7215**](scripts/[clientscript,ground_items_focus_changed].cs2) `[clientscript,ground_items_focus_changed]` [**7216**](scripts/[proc,script7216].cs2) [**7217**](scripts/[clientscript,script7217].cs2) [**7218**](scripts/[proc,script7218].cs2) [**7219**](scripts/[proc,script7219].cs2) -[**7220**](scripts/[clientscript,script7220].cs2) +[**7220**](scripts/[proc,ground_items_clear_vector].cs2) `[proc,ground_items_clear_vector]` [**7221**](scripts/[proc,script7221].cs2) [**7222**](scripts/[proc,script7222].cs2) [**7223**](scripts/[proc,script7223].cs2) [**7224**](scripts/[proc,script7224].cs2) [**7225**](scripts/[proc,script7225].cs2) [**7226**](scripts/[trigger_45,_].cs2) `[trigger_45,_]` -[**7227**](scripts/[proc,script7227].cs2) +[**7227**](scripts/[proc,ground_items_setup].cs2) `[proc,ground_items_setup]` [**7228**](scripts/[proc,script7228].cs2) -[**7229**](scripts/[clientscript,script7229].cs2) -[**7230**](scripts/[clientscript,script7230].cs2) +[**7229**](scripts/[clientscript,ground_items_transmit].cs2) `[clientscript,ground_items_transmit]` +[**7230**](scripts/[clientscript,ground_items_key].cs2) `[clientscript,ground_items_key]` [**7231**](scripts/[clientscript,script7231].cs2) [**7232**](scripts/[proc,script7232].cs2) -[**7233**](scripts/[clientscript,script7233].cs2) -[**7234**](scripts/[clientscript,script7234].cs2) +[**7233**](scripts/[clientscript,ground_items_highlight].cs2) `[clientscript,ground_items_highlight]` +[**7234**](scripts/[clientscript,ground_items_filter].cs2) `[clientscript,ground_items_filter]` [**7235**](scripts/[clientscript,script7235].cs2) -[**7236**](scripts/[proc,script7236].cs2) -[**7237**](scripts/[clientscript,script7237].cs2) -[**7238**](scripts/[proc,script7238].cs2) -[**7239**](scripts/[proc,script7239].cs2) +[**7236**](scripts/[proc,ground_items_price].cs2) `[proc,ground_items_price]` +[**7237**](scripts/[clientscript,cabbage_lookup].cs2) `[clientscript,cabbage_lookup]` +[**7238**](scripts/[proc,ground_items_custom_highlight].cs2) `[proc,ground_items_custom_highlight]` +[**7239**](scripts/[proc,ground_items_display].cs2) `[proc,ground_items_display]` [**7240**](scripts/[proc,script7240].cs2) [**7241**](scripts/[proc,script7241].cs2) [**7242**](scripts/[proc,script7242].cs2) diff --git a/scripts/[clientscript,add_overlaytimer_loc].cs2 b/scripts/[clientscript,add_overlaytimer_loc].cs2 index f70934d4b..6d4e1bd79 100644 --- a/scripts/[clientscript,add_overlaytimer_loc].cs2 +++ b/scripts/[clientscript,add_overlaytimer_loc].cs2 @@ -18,7 +18,7 @@ switch_locshape ($locshape2) { ~debug_mes("Overlay Timers: No locfind overlay ID specified for loc_shape. Timer ID: "); return; } -$entityoverlay7 = _7204($coord0, $int8, 0, 1, 1, 0); -if (_202($entityoverlay7) = ^true) { +$entityoverlay7 = entityoverlay_create_coord($coord0, $int8, 0, 1, 1, 0); +if (if_find_entityoverlay($entityoverlay7) = ^true) { cc_setontimer("overlaytimer_loc_find($coord0, $loc1, $int3, clientclock, calc($int4 * 30), $colour5, $int6, $int8)"); } diff --git a/scripts/[clientscript,bugreport_textinput].cs2 b/scripts/[clientscript,bugreport_textinput].cs2 index 96b3a6c4f..8a107ff8c 100644 --- a/scripts/[clientscript,bugreport_textinput].cs2 +++ b/scripts/[clientscript,bugreport_textinput].cs2 @@ -1,10 +1,10 @@ // 1905 -[clientscript,bugreport_textinput](int $int0) +[clientscript,bugreport_textinput](component $component0) def_string $string0 = ""; if (~on_mobile = true) { - if ($int0 = 10223631) { + if ($component0 = interface_156:15) { $string0 = %varcstring372; - } else if ($int0 = 10223637) { + } else if ($component0 = interface_156:21) { $string0 = %varcstring373; } ~keyboard_show_string(0, 500, $string0); diff --git a/scripts/[clientscript,script7237].cs2 b/scripts/[clientscript,cabbage_lookup].cs2 similarity index 84% rename from scripts/[clientscript,script7237].cs2 rename to scripts/[clientscript,cabbage_lookup].cs2 index 4acc2f98e..366f92057 100644 --- a/scripts/[clientscript,script7237].cs2 +++ b/scripts/[clientscript,cabbage_lookup].cs2 @@ -1,5 +1,5 @@ // 7237 -[clientscript,script7237] +[clientscript,cabbage_lookup] def_int $int0 = 0; def_int $int1 = 0; $int0, $int1 = stockmarket_getvalue(cabbage_1965); diff --git a/scripts/[clientscript,cannon_overlay_transmit].cs2 b/scripts/[clientscript,cannon_overlay_transmit].cs2 index 6db44e792..c16eeb8c8 100644 --- a/scripts/[clientscript,cannon_overlay_transmit].cs2 +++ b/scripts/[clientscript,cannon_overlay_transmit].cs2 @@ -3,7 +3,7 @@ if (%varbit14174 = $int1 & %varbit13672 = $int2 & %var3551 = $coord3) { return; } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("cannon_overlay_transmit($entityoverlay0, %varbit14174, %varbit13672, %var3551, $coord4){var3417}"); } ~cannon_overlay_create($entityoverlay0, $coord4); diff --git a/scripts/[clientscript,cc_graphic_swapper_entityoverlay].cs2 b/scripts/[clientscript,cc_graphic_swapper_entityoverlay].cs2 new file mode 100644 index 000000000..cb1874281 --- /dev/null +++ b/scripts/[clientscript,cc_graphic_swapper_entityoverlay].cs2 @@ -0,0 +1,8 @@ +// 7121 +[clientscript,cc_graphic_swapper_entityoverlay](entityoverlay $entityoverlay0, int $comsubid1, graphic $graphic2, component $component3) +if (cc_find_entityoverlay($entityoverlay0, $comsubid1) = ^true) { + cc_setgraphic($graphic2); +} +if ($component3 ! null) { + ~deltooltip_action($component3); +} diff --git a/scripts/[clientscript,chatbox_open_input].cs2 b/scripts/[clientscript,chatbox_open_input].cs2 index 1b5aff4fe..bc2851343 100644 --- a/scripts/[clientscript,chatbox_open_input].cs2 +++ b/scripts/[clientscript,chatbox_open_input].cs2 @@ -4,5 +4,5 @@ if (~on_mobile = true) { if (if_hassub(interface_162:559) = true | if_hassub(interface_162:558) = true | if_gethide(interface_162:37) = false) { return; } - _6522(%varcstring335, 80); + mobile_keyboardshowstring(%varcstring335, 80); } diff --git a/scripts/[clientscript,chattimestamp].cs2 b/scripts/[clientscript,chattimestamp].cs2 index c638b51e6..fbb9a32d7 100644 --- a/scripts/[clientscript,chattimestamp].cs2 +++ b/scripts/[clientscript,chattimestamp].cs2 @@ -15,9 +15,9 @@ if ($int0 = 400) { } if ($int0 = 500) { mes("Zooming Ui in 2x"); - _6210(200); + uizoom_set(200); } if ($int0 = 501) { mes("Resetting Ui Zoom"); - _6212; + uizoom_reset; } diff --git a/scripts/[clientscript,cluehelper_clear_highlights].cs2 b/scripts/[clientscript,cluehelper_clear_highlights].cs2 index 02b291f3e..b79d5fcbf 100644 --- a/scripts/[clientscript,cluehelper_clear_highlights].cs2 +++ b/scripts/[clientscript,cluehelper_clear_highlights].cs2 @@ -1,6 +1,6 @@ // 6493 [clientscript,cluehelper_clear_highlights] -_7039(9); -_7014(9); -_7009(9); -_7004(9); +highlight_tile_clear(9); +highlight_loc_clear(9); +highlight_npctype_clear(9); +highlight_npc_clear(9); diff --git a/scripts/[clientscript,cluehelper_key_npc_invtransmit].cs2 b/scripts/[clientscript,cluehelper_key_npc_invtransmit].cs2 index 58ff87434..2edb8a720 100644 --- a/scripts/[clientscript,cluehelper_key_npc_invtransmit].cs2 +++ b/scripts/[clientscript,cluehelper_key_npc_invtransmit].cs2 @@ -7,6 +7,6 @@ if ($int6 = 0 & inv_total(inv, $obj5) > 0) { $int6 = 0; ~cluehelper_key_npc_draw($dbrow0, $dbrow1, $entityoverlay2, $int3, $npc_uid4, $obj5, $int6); } -if (_202($entityoverlay2) = ^true) { +if (if_find_entityoverlay($entityoverlay2) = ^true) { cc_setoninvtransmit("cluehelper_key_npc_invtransmit($dbrow0, $dbrow1, $entityoverlay2, $int3, $npc_uid4, $obj5, $int6){inv}"); } diff --git a/scripts/[clientscript,cluehelper_key_npc_vartransmit].cs2 b/scripts/[clientscript,cluehelper_key_npc_vartransmit].cs2 index e95be4574..1a957fd9e 100644 --- a/scripts/[clientscript,cluehelper_key_npc_vartransmit].cs2 +++ b/scripts/[clientscript,cluehelper_key_npc_vartransmit].cs2 @@ -4,7 +4,7 @@ if (%varbit14189 = $int5 & %varbit14184 = $int6 & %var3546 = $dbrow0) { return; } if (%var3546 ! $dbrow0) { - if (_202($entityoverlay2) = ^true) { + if (if_find_entityoverlay($entityoverlay2) = ^true) { cc_setonvartransmit("loadnpc_cluehelper_generic_transmit($entityoverlay2, %var3546, $npc_uid4, $int3, %varbit14189){var3546, var3543}"); } if (npc_finduid($npc_uid4) = true) { @@ -13,6 +13,6 @@ if (%var3546 ! $dbrow0) { return; } ~cluehelper_key_npc_draw($dbrow0, $dbrow1, $entityoverlay2, $int3, $npc_uid4, $obj7, $int8); -if (_202($entityoverlay2) = ^true) { +if (if_find_entityoverlay($entityoverlay2) = ^true) { cc_setonvartransmit("cluehelper_key_npc_vartransmit($dbrow0, $dbrow1, $entityoverlay2, $int3, $npc_uid4, %varbit14189, %varbit14184, $obj7, $int8){var3546, var3543}"); } diff --git a/scripts/[clientscript,cluehelper_overlay_dig_transmit].cs2 b/scripts/[clientscript,cluehelper_overlay_dig_transmit].cs2 index d77608657..d2aaae6fd 100644 --- a/scripts/[clientscript,cluehelper_overlay_dig_transmit].cs2 +++ b/scripts/[clientscript,cluehelper_overlay_dig_transmit].cs2 @@ -1,10 +1,10 @@ // 6504 [clientscript,cluehelper_overlay_dig_transmit](dbrow $dbrow0, coord $coord1, obj $obj2, int $int3, npc_uid $npc_uid4, npc_uid $npc_uid5, npc_uid $npc_uid6, dbrow $dbrow7, int $int8, int $int9) -if (_6951($coord1) = true) { +if (tile_find($coord1) = true) { if ($int3 = %varbit14189 & $dbrow0 = %var3546 & $npc_uid4 = %var3548 & $npc_uid5 = %var3549 & $npc_uid6 = %var3550 & $dbrow7 = %var3547 & %varbit14182 = $int8 & %varbit14184 = $int9) { return; } else if (%var3546 ! $dbrow0 | %varbit14182 = 0) { - _7214($coord1, 7); + entityoverlay_delete_coord($coord1, 7); highlight_tile_off($coord1, 9, 1); } ~cluehelper_overlay_dig_draw($dbrow0, $coord1, $obj2); diff --git a/scripts/[clientscript,script6506].cs2 b/scripts/[clientscript,cluehelper_overlay_loc_transmit].cs2 similarity index 51% rename from scripts/[clientscript,script6506].cs2 rename to scripts/[clientscript,cluehelper_overlay_loc_transmit].cs2 index ee530c6ac..b6843db65 100644 --- a/scripts/[clientscript,script6506].cs2 +++ b/scripts/[clientscript,cluehelper_overlay_loc_transmit].cs2 @@ -1,11 +1,11 @@ // 6506 -[clientscript,script6506](entityoverlay $entityoverlay0, dbrow $dbrow1, loc $loc2, coord $coord3, obj $obj4, int $int5, npc_uid $npc_uid6, npc_uid $npc_uid7, npc_uid $npc_uid8, dbrow $dbrow9, int $int10, int $int11) +[clientscript,cluehelper_overlay_loc_transmit](entityoverlay $entityoverlay0, dbrow $dbrow1, loc $loc2, coord $coord3, obj $obj4, int $int5, npc_uid $npc_uid6, npc_uid $npc_uid7, npc_uid $npc_uid8, dbrow $dbrow9, int $int10, int $int11) if (loc_find($coord3, $loc2) = true) { if ($int5 = %varbit14189 & $dbrow1 = %var3546 & $npc_uid6 = %var3548 & $npc_uid7 = %var3549 & $npc_uid8 = %var3550 & $dbrow9 = %var3547 & %varbit14184 = $int10 & %varbit14182 = $int11) { return; } else if (%var3546 ! $dbrow1 | %varbit14182 = 0) { - _7211(5); + entityoverlay_delete_loc(5); highlight_loc_off($loc2, $coord3, 9, 1); } - ~script6505($dbrow1, $loc2, $coord3, $obj4); + ~cluehelper_overlay_loc_draw($dbrow1, $loc2, $coord3, $obj4); } diff --git a/scripts/[clientscript,script6495].cs2 b/scripts/[clientscript,cluehelper_overlay_mappost].cs2 similarity index 72% rename from scripts/[clientscript,script6495].cs2 rename to scripts/[clientscript,cluehelper_overlay_mappost].cs2 index df1246e38..b1de92d1a 100644 --- a/scripts/[clientscript,script6495].cs2 +++ b/scripts/[clientscript,cluehelper_overlay_mappost].cs2 @@ -1,5 +1,5 @@ // 6495 -[clientscript,script6495] +[clientscript,cluehelper_overlay_mappost] if (%varbit14182 = 0) { return; } diff --git a/scripts/[clientscript,fade_component].cs2 b/scripts/[clientscript,fade_component].cs2 new file mode 100644 index 000000000..4cf7acaf6 --- /dev/null +++ b/scripts/[clientscript,fade_component].cs2 @@ -0,0 +1,3 @@ +// 7059 +[clientscript,fade_component](int $int0, int $int1, int $int2, component $component3) +~fade_component($int0, $int1, $int2, $component3); diff --git a/scripts/[clientscript,fade_component_update].cs2 b/scripts/[clientscript,fade_component_update].cs2 new file mode 100644 index 000000000..3b21a8709 --- /dev/null +++ b/scripts/[clientscript,fade_component_update].cs2 @@ -0,0 +1,3 @@ +// 7061 +[clientscript,fade_component_update](int $int0, int $int1, int $int2, int $int3, component $component4) +~fade_component_increment($int0, $int1, $int2, calc($int3 - clientclock), $component4); diff --git a/scripts/[clientscript,fade_overlay].cs2 b/scripts/[clientscript,fade_overlay].cs2 index 8008acd62..570ddea36 100644 --- a/scripts/[clientscript,fade_overlay].cs2 +++ b/scripts/[clientscript,fade_overlay].cs2 @@ -1,3 +1,3 @@ // 948 [clientscript,fade_overlay](int $int0, int $int1, int $int2, int $int3, int $int4) -~script7058($int0, $int1, $int2, $int3, $int4, interface_174:1); +~fade_overlay($int0, $int1, $int2, $int3, $int4, interface_174:1); diff --git a/scripts/[clientscript,fade_overlay_specific].cs2 b/scripts/[clientscript,fade_overlay_specific].cs2 new file mode 100644 index 000000000..c14cefae7 --- /dev/null +++ b/scripts/[clientscript,fade_overlay_specific].cs2 @@ -0,0 +1,3 @@ +// 7057 +[clientscript,fade_overlay_specific](int $int0, int $int1, int $int2, int $int3, int $int4, component $component5) +~fade_overlay($int0, $int1, $int2, $int3, $int4, $component5); diff --git a/scripts/[clientscript,fishing_spot_indicator_stattransmit].cs2 b/scripts/[clientscript,fishing_spot_indicator_stattransmit].cs2 index acd226aab..98314eb1d 100644 --- a/scripts/[clientscript,fishing_spot_indicator_stattransmit].cs2 +++ b/scripts/[clientscript,fishing_spot_indicator_stattransmit].cs2 @@ -5,6 +5,6 @@ if ($lvl7 = $lvl2) { return; } ~fishing_spot_indicator_create($entityoverlay0, $struct1, $npc_uid3, $int4, $loc5, $coord6); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonstattransmit("fishing_spot_indicator_stattransmit($entityoverlay0, $struct1, $lvl7, $npc_uid3, $int4, $loc5, $coord6){fishing, agility, strength}"); } diff --git a/scripts/[clientscript,fishing_spot_indicator_vartransmit].cs2 b/scripts/[clientscript,fishing_spot_indicator_vartransmit].cs2 index 8962fdd4f..ada8e46f4 100644 --- a/scripts/[clientscript,fishing_spot_indicator_vartransmit].cs2 +++ b/scripts/[clientscript,fishing_spot_indicator_vartransmit].cs2 @@ -4,6 +4,6 @@ if ($int2 = %varbit12349 & $int3 = %varbit12350 & $int4 = %varbit12351) { return; } ~fishing_spot_indicator_create($entityoverlay0, $struct1, $npc_uid5, $int6, $loc7, $coord8); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("fishing_spot_indicator_vartransmit($entityoverlay0, $struct1, %varbit12349, %varbit12350, %varbit12351, $npc_uid5, $int6, $loc7, $coord8){var2856, var3074}"); } diff --git a/scripts/[clientscript,ground_items_confirm].cs2 b/scripts/[clientscript,ground_items_confirm].cs2 new file mode 100644 index 000000000..14b189a6e --- /dev/null +++ b/scripts/[clientscript,ground_items_confirm].cs2 @@ -0,0 +1,3 @@ +// 7214 +[clientscript,ground_items_confirm] +return; diff --git a/scripts/[clientscript,script7234].cs2 b/scripts/[clientscript,ground_items_filter].cs2 similarity index 54% rename from scripts/[clientscript,script7234].cs2 rename to scripts/[clientscript,ground_items_filter].cs2 index 31a01ae8a..4a14cd6d0 100644 --- a/scripts/[clientscript,script7234].cs2 +++ b/scripts/[clientscript,ground_items_filter].cs2 @@ -1,12 +1,12 @@ // 7234 -[clientscript,script7234](obj $obj0) -if (~script7225(stringvector_3, $obj0, 0) = 1) { +[clientscript,ground_items_filter](obj $obj0) +if (~script7225(stringvector_3, $obj0, false) = 1) { ~script7224(stringvector_3, $obj0, 1); } else { - if (~script7225(stringvector_4, $obj0, 0) = 1) { + if (~script7225(stringvector_4, $obj0, false) = 1) { ~script7224(stringvector_4, $obj0, 0); } - if (~script7225(stringvector_4, $obj0, 1) = 1) { + if (~script7225(stringvector_4, $obj0, true) = 1) { mes_typed(^chattype_spam, " is being ignored via a wildcard entry."); } ~script7223(stringvector_3, $obj0, 1); diff --git a/scripts/[clientscript,ground_items_focus_changed].cs2 b/scripts/[clientscript,ground_items_focus_changed].cs2 new file mode 100644 index 000000000..0c6246479 --- /dev/null +++ b/scripts/[clientscript,ground_items_focus_changed].cs2 @@ -0,0 +1,10 @@ +// 7215 +[clientscript,ground_items_focus_changed](component $component0, int $comsubid1, stringvector $stringvector2) +if ($comsubid1 ! -1) { + if (cc_find($component0, $comsubid1) = ^true & cc_input_getfocus = true) { + return; + } +} else if (if_input_getfocus($component0) = true) { + return; +} +~script7216($component0, $comsubid1, $stringvector2); diff --git a/scripts/[clientscript,script7233].cs2 b/scripts/[clientscript,ground_items_highlight].cs2 similarity index 54% rename from scripts/[clientscript,script7233].cs2 rename to scripts/[clientscript,ground_items_highlight].cs2 index bef339a85..e4f0fdc3e 100644 --- a/scripts/[clientscript,script7233].cs2 +++ b/scripts/[clientscript,ground_items_highlight].cs2 @@ -1,12 +1,12 @@ // 7233 -[clientscript,script7233](obj $obj0) -if (~script7225(stringvector_4, $obj0, 0) = 1) { +[clientscript,ground_items_highlight](obj $obj0) +if (~script7225(stringvector_4, $obj0, false) = 1) { ~script7224(stringvector_4, $obj0, 1); } else { - if (~script7225(stringvector_3, $obj0, 0) = 1) { + if (~script7225(stringvector_3, $obj0, false) = 1) { ~script7224(stringvector_3, $obj0, 0); } - if (~script7225(stringvector_3, $obj0, 1) = 1) { + if (~script7225(stringvector_3, $obj0, true) = 1) { mes_typed(^chattype_spam, " is being highlighted via a wildcard entry."); } ~script7223(stringvector_4, $obj0, 1); diff --git a/scripts/[clientscript,ground_items_init].cs2 b/scripts/[clientscript,ground_items_init].cs2 new file mode 100644 index 000000000..1b8592a32 --- /dev/null +++ b/scripts/[clientscript,ground_items_init].cs2 @@ -0,0 +1,3 @@ +// 7205 +[clientscript,ground_items_init] +~ground_items_build; diff --git a/scripts/[clientscript,ground_items_key].cs2 b/scripts/[clientscript,ground_items_key].cs2 new file mode 100644 index 000000000..a68fff1d0 --- /dev/null +++ b/scripts/[clientscript,ground_items_key].cs2 @@ -0,0 +1,5 @@ +// 7230 +[clientscript,ground_items_key](int $key0, coord $coord1) +if ($key0 = %varbit14877) { + ~ground_items_setup($coord1); +} diff --git a/scripts/[clientscript,ground_items_toggle_op].cs2 b/scripts/[clientscript,ground_items_toggle_op].cs2 new file mode 100644 index 000000000..3b11b870a --- /dev/null +++ b/scripts/[clientscript,ground_items_toggle_op].cs2 @@ -0,0 +1,4 @@ +// 7207 +[clientscript,ground_items_toggle_op](component $component0, int $comsubid1) +%varbit14869 = calc(1 - %varbit14869); +~ground_items_toggle_synch($component0, $comsubid1); diff --git a/scripts/[clientscript,ground_items_toggle_transmit].cs2 b/scripts/[clientscript,ground_items_toggle_transmit].cs2 new file mode 100644 index 000000000..eefa8b1ff --- /dev/null +++ b/scripts/[clientscript,ground_items_toggle_transmit].cs2 @@ -0,0 +1,3 @@ +// 7208 +[clientscript,ground_items_toggle_transmit](component $component0, int $comsubid1) +~ground_items_toggle_synch($component0, $comsubid1); diff --git a/scripts/[clientscript,ground_items_transmit].cs2 b/scripts/[clientscript,ground_items_transmit].cs2 new file mode 100644 index 000000000..e81791d54 --- /dev/null +++ b/scripts/[clientscript,ground_items_transmit].cs2 @@ -0,0 +1,3 @@ +// 7229 +[clientscript,ground_items_transmit](coord $coord0) +~ground_items_setup($coord0); diff --git a/scripts/[clientscript,helper_agility_stattransmit].cs2 b/scripts/[clientscript,helper_agility_stattransmit].cs2 index a91a21b9e..1d7a465fc 100644 --- a/scripts/[clientscript,helper_agility_stattransmit].cs2 +++ b/scripts/[clientscript,helper_agility_stattransmit].cs2 @@ -7,6 +7,6 @@ if ($lvl1 = $lvl6 & $lvl2 = $lvl7 & $lvl3 = $lvl8) { return; } ~script5724($entityoverlay0, $loc4, $coord5); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonstattransmit("helper_agility_stattransmit($entityoverlay0, $lvl6, $lvl7, $lvl8, $loc4, $coord5){ranged, agility, strength}"); } diff --git a/scripts/[clientscript,helper_agility_vartransmit].cs2 b/scripts/[clientscript,helper_agility_vartransmit].cs2 index 1c53d87a8..493fa7858 100644 --- a/scripts/[clientscript,helper_agility_vartransmit].cs2 +++ b/scripts/[clientscript,helper_agility_vartransmit].cs2 @@ -4,6 +4,6 @@ if ($int1 = %varbit13135 & $int2 = %varbit13136) { return; } ~script5724($entityoverlay0, $loc3, $coord4); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { ~helper_agility_vartransmit($entityoverlay0, $loc3, $coord4); } diff --git a/scripts/[clientscript,loadnpc_cluehelper_generic_transmit].cs2 b/scripts/[clientscript,loadnpc_cluehelper_generic_transmit].cs2 index 511eceb07..c6a8057e3 100644 --- a/scripts/[clientscript,loadnpc_cluehelper_generic_transmit].cs2 +++ b/scripts/[clientscript,loadnpc_cluehelper_generic_transmit].cs2 @@ -3,7 +3,7 @@ if (%varbit14189 = $int4 & $dbrow1 = %var3546) { return; } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("loadnpc_cluehelper_generic_transmit($entityoverlay0, %var3546, $npc_uid2, $int3, %varbit14189){var3546, var3543}"); } if (npc_finduid($npc_uid2) = true) { diff --git a/scripts/[clientscript,loadnpc_cluehelper_uri_transmit].cs2 b/scripts/[clientscript,loadnpc_cluehelper_uri_transmit].cs2 index 8b520a745..6fabe0a15 100644 --- a/scripts/[clientscript,loadnpc_cluehelper_uri_transmit].cs2 +++ b/scripts/[clientscript,loadnpc_cluehelper_uri_transmit].cs2 @@ -3,11 +3,11 @@ if (%varbit14189 = $int3 & %var3548 = $npc_uid4 & %var3547 = $dbrow5 & %var3546 = $dbrow6) { return; } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("loadnpc_cluehelper_uri_transmit($entityoverlay0, $npc_uid1, $int2, %varbit14189, %var3548, %var3547, %var3546){var3543, var3546, var3548, var3547}"); } highlight_npc_off($npc_uid1, $int2, 9); -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); if (npc_finduid($npc_uid1) = true) { ~loadnpc_cluehelper_uri_overlay($entityoverlay0, $npc_uid1, $int2); } diff --git a/scripts/[clientscript,logout_timer_notifier].cs2 b/scripts/[clientscript,logout_timer_notifier].cs2 index e95190d1a..7f1402d0f 100644 --- a/scripts/[clientscript,logout_timer_notifier].cs2 +++ b/scripts/[clientscript,logout_timer_notifier].cs2 @@ -3,7 +3,7 @@ if (calc(clientclock % 50) ! 0) { return; } -def_int $int0 = _3328; +def_int $int0 = idletimer_get; if ($int0 < 30000) { if (%varcint552 = 1) { return; diff --git a/scripts/[clientscript,script7128].cs2 b/scripts/[clientscript,loottools_init].cs2 similarity index 81% rename from scripts/[clientscript,script7128].cs2 rename to scripts/[clientscript,loottools_init].cs2 index 37cc8044c..0d006095e 100644 --- a/scripts/[clientscript,script7128].cs2 +++ b/scripts/[clientscript,loottools_init].cs2 @@ -1,9 +1,9 @@ // 7128 -[clientscript,script7128] +[clientscript,loottools_init] ~script7166; ~script7133; -~script7132; -if_setonresize("script7131", interface_650:0); +~loottools_size; +if_setonresize("loottools_size", interface_650:0); ~questlist_settings_button_init(interface_650:17); def_component $component0 = interface_650:57; def_component $component1 = interface_650:58; diff --git a/scripts/[clientscript,loottools_size].cs2 b/scripts/[clientscript,loottools_size].cs2 new file mode 100644 index 000000000..87d0af117 --- /dev/null +++ b/scripts/[clientscript,loottools_size].cs2 @@ -0,0 +1,3 @@ +// 7131 +[clientscript,loottools_size] +~loottools_size; diff --git a/scripts/[clientscript,loottracker_clear_data].cs2 b/scripts/[clientscript,loottracker_clear_data].cs2 new file mode 100644 index 000000000..b1356df39 --- /dev/null +++ b/scripts/[clientscript,loottracker_clear_data].cs2 @@ -0,0 +1,5 @@ +// 7189 +[clientscript,loottracker_clear_data] +loottracker_clear_data; +~script7166; +~script7133; diff --git a/scripts/[clientscript,script7079].cs2 b/scripts/[clientscript,makeover_hover_colour].cs2 similarity index 73% rename from scripts/[clientscript,script7079].cs2 rename to scripts/[clientscript,makeover_hover_colour].cs2 index 7c70f5d00..f4e83311e 100644 --- a/scripts/[clientscript,script7079].cs2 +++ b/scripts/[clientscript,makeover_hover_colour].cs2 @@ -1,5 +1,5 @@ // 7079 -[clientscript,script7079](component $component0, int $comsubid1, boolean $boolean2) +[clientscript,makeover_hover_colour](component $component0, int $comsubid1, boolean $boolean2) if (cc_find($component0, $comsubid1) = ^true & cc_find($component0, calc($comsubid1 + 1)) = ^true) { if ($boolean2 = true) { cc_setcolour(^white); diff --git a/scripts/[clientscript,script7078].cs2 b/scripts/[clientscript,makeover_hover_item].cs2 similarity index 74% rename from scripts/[clientscript,script7078].cs2 rename to scripts/[clientscript,makeover_hover_item].cs2 index 34ddf2f04..efb9287f4 100644 --- a/scripts/[clientscript,script7078].cs2 +++ b/scripts/[clientscript,makeover_hover_item].cs2 @@ -1,5 +1,5 @@ // 7078 -[clientscript,script7078](component $component0, int $comsubid1, boolean $boolean2) +[clientscript,makeover_hover_item](component $component0, int $comsubid1, boolean $boolean2) if (cc_find($component0, $comsubid1) = ^true & cc_find($component0, calc($comsubid1 + 1)) = ^true) { if ($boolean2 = true) { cc_setcolour(^white); diff --git a/scripts/[clientscript,makeover_info_mouseleave].cs2 b/scripts/[clientscript,makeover_info_mouseleave].cs2 new file mode 100644 index 000000000..49b847dbe --- /dev/null +++ b/scripts/[clientscript,makeover_info_mouseleave].cs2 @@ -0,0 +1,5 @@ +// 7089 +[clientscript,makeover_info_mouseleave](component $component0, int $comsubid1, int $colour2) +if (cc_find($component0, $comsubid1) = ^true) { + cc_setcolour($colour2); +} diff --git a/scripts/[clientscript,script7088].cs2 b/scripts/[clientscript,makeover_info_mouseover].cs2 similarity index 50% rename from scripts/[clientscript,script7088].cs2 rename to scripts/[clientscript,makeover_info_mouseover].cs2 index 1f23996c9..243c84ec9 100644 --- a/scripts/[clientscript,script7088].cs2 +++ b/scripts/[clientscript,makeover_info_mouseover].cs2 @@ -1,5 +1,5 @@ // 7088 -[clientscript,script7088](component $component0, int $comsubid1) +[clientscript,makeover_info_mouseover](component $component0, int $comsubid1) if (cc_find($component0, $comsubid1) = ^true) { cc_setcolour(^white); } diff --git a/scripts/[clientscript,makeover_init].cs2 b/scripts/[clientscript,makeover_init].cs2 new file mode 100644 index 000000000..396ea7ab4 --- /dev/null +++ b/scripts/[clientscript,makeover_init].cs2 @@ -0,0 +1,16 @@ +// 6776 +[clientscript,makeover_init](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10) +def_component $component11 = interface_516:1; +def_component $component12 = interface_516:0; +if ($component12 ! null) { + ~makeover_size_check($component11, $component12, ^min_32bit_int, ^min_32bit_int, $component6, $component2); +} +~steelborder($component0, "Makeover", 0); +~makeover_draw_content($component1, $component2, $component3, $component4, $component5, $component6, $component10); +~makeover_draw_colours($component4); +%varcint1148 = %var3788; +%varcint1150 = 0; +%varcint1151 = 0; +%varcint1153 = 0; +if_setonvartransmit("script7069($component1, $component2, $component3, $component4, $component5, $component6, $component10){var3787, var3789, var3788}", $component1); +~script7083($component7, $component8, $component9, -1); diff --git a/scripts/[clientscript,script7081].cs2 b/scripts/[clientscript,makeover_op_colour].cs2 similarity index 79% rename from scripts/[clientscript,script7081].cs2 rename to scripts/[clientscript,makeover_op_colour].cs2 index cf6da44b3..c30363ecb 100644 --- a/scripts/[clientscript,script7081].cs2 +++ b/scripts/[clientscript,makeover_op_colour].cs2 @@ -1,5 +1,5 @@ // 7081 -[clientscript,script7081](component $component0, int $comsubid1) +[clientscript,makeover_op_colour](component $component0, int $comsubid1) if (cc_find($component0, $comsubid1) = ^true) { cc_settrans(125); cc_setontimer("cc_settrans_temporarily_end($component0, $comsubid1, 0, calc(clientclock + 10))"); diff --git a/scripts/[clientscript,script7080].cs2 b/scripts/[clientscript,makeover_op_item].cs2 similarity index 79% rename from scripts/[clientscript,script7080].cs2 rename to scripts/[clientscript,makeover_op_item].cs2 index 1174cbc49..e820f4644 100644 --- a/scripts/[clientscript,script7080].cs2 +++ b/scripts/[clientscript,makeover_op_item].cs2 @@ -1,5 +1,5 @@ // 7080 -[clientscript,script7080](component $component0, int $comsubid1) +[clientscript,makeover_op_item](component $component0, int $comsubid1) if (cc_find($component0, $comsubid1) = ^true) { cc_settrans(125); cc_setontimer("cc_settrans_temporarily_end($component0, $comsubid1, 0, calc(clientclock + 10))"); diff --git a/scripts/[clientscript,makeover_size_check].cs2 b/scripts/[clientscript,makeover_size_check].cs2 new file mode 100644 index 000000000..a20e83fad --- /dev/null +++ b/scripts/[clientscript,makeover_size_check].cs2 @@ -0,0 +1,3 @@ +// 7090 +[clientscript,makeover_size_check](component $component0, component $component1, int $width2, int $height3, component $component4, component $component5) +~makeover_size_check($component0, $component1, $width2, $height3, $component4, $component5); diff --git a/scripts/[clientscript,script7075].cs2 b/scripts/[clientscript,makeover_spin].cs2 similarity index 90% rename from scripts/[clientscript,script7075].cs2 rename to scripts/[clientscript,makeover_spin].cs2 index cb6afbd4e..d430e177e 100644 --- a/scripts/[clientscript,script7075].cs2 +++ b/scripts/[clientscript,makeover_spin].cs2 @@ -1,5 +1,5 @@ // 7075 -[clientscript,script7075](component $component0, int $comsubid1) +[clientscript,makeover_spin](component $component0, int $comsubid1) def_int $int2 = 0; if (cc_find($component0, $comsubid1) = ^true) { if (%varcint1151 = 0) { diff --git a/scripts/[clientscript,membership_benefits_prompt_banner].cs2 b/scripts/[clientscript,membership_benefits_prompt_banner].cs2 index 7b206a655..388a658dd 100644 --- a/scripts/[clientscript,membership_benefits_prompt_banner].cs2 +++ b/scripts/[clientscript,membership_benefits_prompt_banner].cs2 @@ -13,7 +13,7 @@ cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); def_int $int11 = ~script7032($int0); def_string $string1 = ~script6066($int11); -cc_setcrm_url($string1); -cc_setcrm_textfont(0, b12_full); -cc_setcrm_textfont(1, p11_full); -cc_setoncrmviewload("script7033($component1, $graphic2, $component3, $graphic4, $graphic5, $x6, $y7, $width8, $height9, $string0)"); +cc_crmview_seturl($string1); +cc_crmview_settextfont(0, b12_full); +cc_crmview_settextfont(1, p11_full); +cc_crmview_setonupdated("script7033($component1, $graphic2, $component3, $graphic4, $graphic5, $x6, $y7, $width8, $height9, $string0)"); diff --git a/scripts/[clientscript,npc_name_timer].cs2 b/scripts/[clientscript,npc_name_timer].cs2 index 927c3bfe7..097f7763f 100644 --- a/scripts/[clientscript,npc_name_timer].cs2 +++ b/scripts/[clientscript,npc_name_timer].cs2 @@ -5,6 +5,6 @@ if ($int0 = %varcint1079) { } $int0 = %varcint1079; ~npc_name_create($entityoverlay1, $npc_uid2, $int3, $string0, $npc4); -if (_202($entityoverlay1) = ^true) { +if (if_find_entityoverlay($entityoverlay1) = ^true) { cc_setontimer("npc_name_timer($int0, $entityoverlay1, $npc_uid2, $int3, $string0, $npc4)"); } diff --git a/scripts/[clientscript,npc_name_vartransmit].cs2 b/scripts/[clientscript,npc_name_vartransmit].cs2 index d6e77c61a..cf9609fb9 100644 --- a/scripts/[clientscript,npc_name_vartransmit].cs2 +++ b/scripts/[clientscript,npc_name_vartransmit].cs2 @@ -4,6 +4,6 @@ if ($int4 = %var3416 & $int5 = %var3417 & %var3540 = $int6 & %var3541 = $int7 & return; } ~npc_name_create($entityoverlay0, $npc_uid1, $int2, $string0, $npc3); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("npc_name_vartransmit($entityoverlay0, $npc_uid1, $int2, $string0, $npc3, %var3416, %var3417, %var3540, %var3541, %var3542, %var1021){var3416, var3417, var3540, var3541, var1021, var3542}"); } diff --git a/scripts/[clientscript,overlaytimer_loc_find].cs2 b/scripts/[clientscript,overlaytimer_loc_find].cs2 index b02a9ff19..e344d1f4d 100644 --- a/scripts/[clientscript,overlaytimer_loc_find].cs2 +++ b/scripts/[clientscript,overlaytimer_loc_find].cs2 @@ -1,11 +1,11 @@ // 5475 [clientscript,overlaytimer_loc_find](coord $coord0, loc $loc1, int $int2, int $clock3, int $int4, int $colour5, int $int6, int $int7) if (loc_find($coord0, $loc1) = true) { - _7214($coord0, $int7); + entityoverlay_delete_coord($coord0, $int7); if (clientclock < calc($clock3 + $int4)) { ~add_overlaytimer_loc($loc1, $int2, $clock3, $int4, $colour5, $int6); } } else if (clientclock > calc($clock3 + 150)) { ~debug_mes("Overlay Timers: Failed to find loc at <~mescoord($coord0)> for timer: "); - _7214($coord0, $int7); + entityoverlay_delete_coord($coord0, $int7); } diff --git a/scripts/[clientscript,overlaytimer_update].cs2 b/scripts/[clientscript,overlaytimer_update].cs2 index 7fe0f8262..44e8dd0c7 100644 --- a/scripts/[clientscript,overlaytimer_update].cs2 +++ b/scripts/[clientscript,overlaytimer_update].cs2 @@ -8,16 +8,16 @@ switch_int ($int3) { case 1 : $int7 = ~max(1, calc(65536 - $int7)); } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { if (clientclock > $clock4) { cc_setontimer(null); - _104($entityoverlay0); + cc_deleteall_entityoverlay($entityoverlay0); return; } - if (_203($entityoverlay0, 1) = ^true) { + if (cc_find_entityoverlay($entityoverlay0, 1) = ^true) { cc_setarc($int6, $int7); } - if (_203($entityoverlay0, 2) = ^true) { + if (cc_find_entityoverlay($entityoverlay0, 2) = ^true) { cc_setarc($int6, $int7); } } diff --git a/scripts/[clientscript,popout_tooltip_clear_clientscript].cs2 b/scripts/[clientscript,popout_tooltip_clear_clientscript].cs2 new file mode 100644 index 000000000..81167fc8f --- /dev/null +++ b/scripts/[clientscript,popout_tooltip_clear_clientscript].cs2 @@ -0,0 +1,3 @@ +// 5547 +[clientscript,popout_tooltip_clear_clientscript] +~popout_tooltip_clear; diff --git a/scripts/[clientscript,quickprayer_button_op].cs2 b/scripts/[clientscript,quickprayer_button_op].cs2 index 3a0fd02a4..57b9c6a15 100644 --- a/scripts/[clientscript,quickprayer_button_op].cs2 +++ b/scripts/[clientscript,quickprayer_button_op].cs2 @@ -2,13 +2,13 @@ [clientscript,quickprayer_button_op](int $opindex0, obj $obj1, component $component2, int $comsubid3, int $comsubid4) def_int $index5 = oc_param($obj1, param_630); if ($opindex0 = 1 & .cc_find($component2, $comsubid4) = ^true) { - if (testbit(~script7054, $index5) = ^true) { - ~script7055(clearbit(~script7054, $index5)); + if (testbit(~quickprayer_selected_get, $index5) = ^true) { + ~quickprayer_selected_set(clearbit(~quickprayer_selected_get, $index5)); } else { if (~prayer_isavailable($obj1) = 0) { return; } - ~script7055(setbit(~script7054, $index5)); + ~quickprayer_selected_set(setbit(~quickprayer_selected_get, $index5)); } sound_synth(interface_select1, 1, 0); if (cc_find($component2, $comsubid3) = ^true) { diff --git a/scripts/[clientscript,script2567].cs2 b/scripts/[clientscript,runweight_init].cs2 similarity index 61% rename from scripts/[clientscript,script2567].cs2 rename to scripts/[clientscript,runweight_init].cs2 index 892f76584..ad3add56b 100644 --- a/scripts/[clientscript,script2567].cs2 +++ b/scripts/[clientscript,runweight_init].cs2 @@ -1,5 +1,5 @@ // 2567 -[clientscript,script2567](component $component0) -~script3153($component0); +[clientscript,runweight_init](component $component0) +~runweight_update($component0); if_setonmisctransmit("script2568(event_com)", $component0); if_setoninvtransmit("script2568(event_com){inv, worn}", $component0); diff --git a/scripts/[clientscript,screen_glow_fadein].cs2 b/scripts/[clientscript,screen_glow_fadein].cs2 index 6def63875..53f07c544 100644 --- a/scripts/[clientscript,screen_glow_fadein].cs2 +++ b/scripts/[clientscript,screen_glow_fadein].cs2 @@ -9,7 +9,7 @@ if (cc_find($component5, 0) = ^true) { return; } cc_setcolour($colour4); - cc_setfillcolour($colour4); + cc_setgradientcolour($colour4); cc_settrans(interpolate($int2, $int3, $clock0, $clock1, clientclock)); - _1124(255); + cc_setgradienttrans(255); } diff --git a/scripts/[clientscript,screen_glow_fadeout].cs2 b/scripts/[clientscript,screen_glow_fadeout].cs2 index e516a411e..067c7b3cc 100644 --- a/scripts/[clientscript,screen_glow_fadeout].cs2 +++ b/scripts/[clientscript,screen_glow_fadeout].cs2 @@ -12,7 +12,7 @@ if (cc_find($component5, 0) = ^true) { return; } cc_setcolour($colour4); - cc_setfillcolour($colour4); + cc_setgradientcolour($colour4); cc_settrans(interpolate($int3, $int2, $clock0, $clock1, clientclock)); - _1124(255); + cc_setgradienttrans(255); } diff --git a/scripts/[clientscript,screen_glow_start].cs2 b/scripts/[clientscript,screen_glow_start].cs2 index 1f3e5d7b2..9a85d84ce 100644 --- a/scripts/[clientscript,screen_glow_start].cs2 +++ b/scripts/[clientscript,screen_glow_start].cs2 @@ -6,8 +6,8 @@ cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); cc_setposition(0, 0, ^setpos_abs_left, ^setpos_abs_bottom); cc_setfill(true); cc_setcolour($colour0); -cc_setfillcolour($colour0); +cc_setgradientcolour($colour0); cc_settrans(255); -_1124(255); -_1125(2); +cc_setgradienttrans(255); +cc_setgradientmode(2); cc_setontimer("screen_glow_fadein(calc(clientclock + $int2), calc(clientclock + $int3), $int4, $int5, $colour0, $component1)"); diff --git a/scripts/[clientscript,script1846].cs2 b/scripts/[clientscript,script1846].cs2 index 03803322f..3796e2f98 100644 --- a/scripts/[clientscript,script1846].cs2 +++ b/scripts/[clientscript,script1846].cs2 @@ -1,3 +1,3 @@ // 1846 [clientscript,script1846](seq $seq0) -_3189($seq0); +seq_prefetch($seq0); diff --git a/scripts/[clientscript,script2352].cs2 b/scripts/[clientscript,script2352].cs2 index 3f0b6bd4d..07ac52465 100644 --- a/scripts/[clientscript,script2352].cs2 +++ b/scripts/[clientscript,script2352].cs2 @@ -75,4 +75,4 @@ if (%varbit11860 = 1) { if (%var176 >= 10) { ~steam_set_unlocked(19, 0); } -$int0 = _3702; +$int0 = steam_storestats; diff --git a/scripts/[clientscript,script2568].cs2 b/scripts/[clientscript,script2568].cs2 index f00110e0a..84d3271f7 100644 --- a/scripts/[clientscript,script2568].cs2 +++ b/scripts/[clientscript,script2568].cs2 @@ -1,3 +1,3 @@ // 2568 [clientscript,script2568](component $component0) -~script3153($component0); +~runweight_update($component0); diff --git a/scripts/[clientscript,script4625].cs2 b/scripts/[clientscript,script4625].cs2 index da3ca2eec..6a5de78d0 100644 --- a/scripts/[clientscript,script4625].cs2 +++ b/scripts/[clientscript,script4625].cs2 @@ -1,6 +1,6 @@ // 4625 [clientscript,script4625] -if (_7003(npc_uid, npc_spawncycle, 1) = true) { +if (highlight_npc_get(npc_uid, npc_spawncycle, 1) = true) { highlight_npc_off(npc_uid, npc_spawncycle, 1); } else { highlight_npc_on(npc_uid, npc_spawncycle, 1); diff --git a/scripts/[clientscript,script4626].cs2 b/scripts/[clientscript,script4626].cs2 index ae0e58932..b2159a788 100644 --- a/scripts/[clientscript,script4626].cs2 +++ b/scripts/[clientscript,script4626].cs2 @@ -1,6 +1,6 @@ // 4626 [clientscript,script4626] -if (_7003(npc_uid, npc_spawncycle, 2) = true) { +if (highlight_npc_get(npc_uid, npc_spawncycle, 2) = true) { highlight_npc_off(npc_uid, npc_spawncycle, 2); } else { highlight_npc_on(npc_uid, npc_spawncycle, 2); diff --git a/scripts/[clientscript,script4627].cs2 b/scripts/[clientscript,script4627].cs2 index 9b164776e..f5f58735a 100644 --- a/scripts/[clientscript,script4627].cs2 +++ b/scripts/[clientscript,script4627].cs2 @@ -1,6 +1,6 @@ // 4627 [clientscript,script4627] -if (_7003(npc_uid, npc_spawncycle, 3) = true) { +if (highlight_npc_get(npc_uid, npc_spawncycle, 3) = true) { highlight_npc_off(npc_uid, npc_spawncycle, 3); } else { highlight_npc_on(npc_uid, npc_spawncycle, 3); diff --git a/scripts/[clientscript,script4628].cs2 b/scripts/[clientscript,script4628].cs2 index f1fb9d682..f5ea193d3 100644 --- a/scripts/[clientscript,script4628].cs2 +++ b/scripts/[clientscript,script4628].cs2 @@ -1,6 +1,6 @@ // 4628 [clientscript,script4628] -if (_7008(npc_type, 1) = true) { +if (highlight_npctype_get(npc_type, 1) = true) { highlight_npctype_off(npc_type, 1); } else { highlight_npctype_on(npc_type, 1); diff --git a/scripts/[clientscript,script4629].cs2 b/scripts/[clientscript,script4629].cs2 index f6e846fe8..698cb2489 100644 --- a/scripts/[clientscript,script4629].cs2 +++ b/scripts/[clientscript,script4629].cs2 @@ -1,6 +1,6 @@ // 4629 [clientscript,script4629] -if (_7008(npc_type, 2) = true) { +if (highlight_npctype_get(npc_type, 2) = true) { highlight_npctype_off(npc_type, 2); } else { highlight_npctype_on(npc_type, 2); diff --git a/scripts/[clientscript,script4630].cs2 b/scripts/[clientscript,script4630].cs2 index b6d95d442..4ba628fa9 100644 --- a/scripts/[clientscript,script4630].cs2 +++ b/scripts/[clientscript,script4630].cs2 @@ -1,6 +1,6 @@ // 4630 [clientscript,script4630] -if (_7008(npc_type, 3) = true) { +if (highlight_npctype_get(npc_type, 3) = true) { highlight_npctype_off(npc_type, 3); } else { highlight_npctype_on(npc_type, 3); diff --git a/scripts/[clientscript,script4631].cs2 b/scripts/[clientscript,script4631].cs2 index 2a59a5594..de2878bef 100644 --- a/scripts/[clientscript,script4631].cs2 +++ b/scripts/[clientscript,script4631].cs2 @@ -1,6 +1,6 @@ // 4631 [clientscript,script4631] -if (_7013(loc_type, loc_coord, 1, 1) = true) { +if (highlight_loc_get(loc_type, loc_coord, 1, 1) = true) { highlight_loc_off(loc_type, loc_coord, 1, 1); } else { highlight_loc_on(loc_type, loc_coord, 1, 1); diff --git a/scripts/[clientscript,script4632].cs2 b/scripts/[clientscript,script4632].cs2 index 923876935..694ca7816 100644 --- a/scripts/[clientscript,script4632].cs2 +++ b/scripts/[clientscript,script4632].cs2 @@ -1,6 +1,6 @@ // 4632 [clientscript,script4632] -if (_7013(loc_type, loc_coord, 2, 1) = true) { +if (highlight_loc_get(loc_type, loc_coord, 2, 1) = true) { highlight_loc_off(loc_type, loc_coord, 2, 1); } else { highlight_loc_on(loc_type, loc_coord, 2, 1); diff --git a/scripts/[clientscript,script4633].cs2 b/scripts/[clientscript,script4633].cs2 index c288f0689..3d02cc59d 100644 --- a/scripts/[clientscript,script4633].cs2 +++ b/scripts/[clientscript,script4633].cs2 @@ -1,6 +1,6 @@ // 4633 [clientscript,script4633] -if (_7013(loc_type, loc_coord, 3, 1) = true) { +if (highlight_loc_get(loc_type, loc_coord, 3, 1) = true) { highlight_loc_off(loc_type, loc_coord, 3, 1); } else { highlight_loc_on(loc_type, loc_coord, 3, 1); diff --git a/scripts/[clientscript,script4634].cs2 b/scripts/[clientscript,script4634].cs2 index 825880a55..5d9c7c3b2 100644 --- a/scripts/[clientscript,script4634].cs2 +++ b/scripts/[clientscript,script4634].cs2 @@ -1,6 +1,6 @@ // 4634 [clientscript,script4634] -if (_7018(loc_type, 1) = true) { +if (highlight_loctype_get(loc_type, 1) = true) { highlight_loctype_off(loc_type, 1); } else { highlight_loctype_on(loc_type, 1); diff --git a/scripts/[clientscript,script4635].cs2 b/scripts/[clientscript,script4635].cs2 index 7fcc065d7..9192e4d06 100644 --- a/scripts/[clientscript,script4635].cs2 +++ b/scripts/[clientscript,script4635].cs2 @@ -1,6 +1,6 @@ // 4635 [clientscript,script4635] -if (_7018(loc_type, 2) = true) { +if (highlight_loctype_get(loc_type, 2) = true) { highlight_loctype_off(loc_type, 2); } else { highlight_loctype_on(loc_type, 2); diff --git a/scripts/[clientscript,script4636].cs2 b/scripts/[clientscript,script4636].cs2 index 91d9fa6e2..5f9fb216e 100644 --- a/scripts/[clientscript,script4636].cs2 +++ b/scripts/[clientscript,script4636].cs2 @@ -1,6 +1,6 @@ // 4636 [clientscript,script4636] -if (_7018(loc_type, 3) = true) { +if (highlight_loctype_get(loc_type, 3) = true) { highlight_loctype_off(loc_type, 3); } else { highlight_loctype_on(loc_type, 3); diff --git a/scripts/[clientscript,script4637].cs2 b/scripts/[clientscript,script4637].cs2 index c10d8436e..400522d01 100644 --- a/scripts/[clientscript,script4637].cs2 +++ b/scripts/[clientscript,script4637].cs2 @@ -1,6 +1,6 @@ // 4637 [clientscript,script4637] -if (_7023(obj_type, obj_coord, 1, 1) = true) { +if (highlight_obj_get(obj_type, obj_coord, 1, 1) = true) { highlight_obj_off(obj_type, obj_coord, 1, 1); } else { highlight_obj_on(obj_type, obj_coord, 1, 1); diff --git a/scripts/[clientscript,script4638].cs2 b/scripts/[clientscript,script4638].cs2 index 294445c71..eb61312f4 100644 --- a/scripts/[clientscript,script4638].cs2 +++ b/scripts/[clientscript,script4638].cs2 @@ -1,6 +1,6 @@ // 4638 [clientscript,script4638] -if (_7023(obj_type, obj_coord, 2, 1) = true) { +if (highlight_obj_get(obj_type, obj_coord, 2, 1) = true) { highlight_obj_off(obj_type, obj_coord, 2, 1); } else { highlight_obj_on(obj_type, obj_coord, 2, 1); diff --git a/scripts/[clientscript,script4639].cs2 b/scripts/[clientscript,script4639].cs2 index 6a29a227b..e5f1b7a70 100644 --- a/scripts/[clientscript,script4639].cs2 +++ b/scripts/[clientscript,script4639].cs2 @@ -1,6 +1,6 @@ // 4639 [clientscript,script4639] -if (_7023(obj_type, obj_coord, 3, 1) = true) { +if (highlight_obj_get(obj_type, obj_coord, 3, 1) = true) { highlight_obj_off(obj_type, obj_coord, 3, 1); } else { highlight_obj_on(obj_type, obj_coord, 3, 1); diff --git a/scripts/[clientscript,script4640].cs2 b/scripts/[clientscript,script4640].cs2 index 6dad8e77f..cb6038c41 100644 --- a/scripts/[clientscript,script4640].cs2 +++ b/scripts/[clientscript,script4640].cs2 @@ -1,6 +1,6 @@ // 4640 [clientscript,script4640] -if (_7028(obj_type, 1) = true) { +if (highlight_objtype_get(obj_type, 1) = true) { highlight_objtype_off(obj_type, 1); } else { highlight_objtype_on(obj_type, 1); diff --git a/scripts/[clientscript,script4641].cs2 b/scripts/[clientscript,script4641].cs2 index 3e1a21f52..2ad63c0dd 100644 --- a/scripts/[clientscript,script4641].cs2 +++ b/scripts/[clientscript,script4641].cs2 @@ -1,6 +1,6 @@ // 4641 [clientscript,script4641] -if (_7028(obj_type, 2) = true) { +if (highlight_objtype_get(obj_type, 2) = true) { highlight_objtype_off(obj_type, 2); } else { highlight_objtype_on(obj_type, 2); diff --git a/scripts/[clientscript,script4642].cs2 b/scripts/[clientscript,script4642].cs2 index 48963f72e..01a2b107a 100644 --- a/scripts/[clientscript,script4642].cs2 +++ b/scripts/[clientscript,script4642].cs2 @@ -1,6 +1,6 @@ // 4642 [clientscript,script4642] -if (_7028(obj_type, 3) = true) { +if (highlight_objtype_get(obj_type, 3) = true) { highlight_objtype_off(obj_type, 3); } else { highlight_objtype_on(obj_type, 3); diff --git a/scripts/[clientscript,script4643].cs2 b/scripts/[clientscript,script4643].cs2 index 771f9f882..5dfdb8adf 100644 --- a/scripts/[clientscript,script4643].cs2 +++ b/scripts/[clientscript,script4643].cs2 @@ -1,6 +1,6 @@ // 4643 [clientscript,script4643] -if (_7033("player_name", 1) = true) { +if (highlight_player_get("player_name", 1) = true) { highlight_player_off("player_name", 1); } else { highlight_player_on("player_name", 1); diff --git a/scripts/[clientscript,script4644].cs2 b/scripts/[clientscript,script4644].cs2 index 628d27bd9..a8afbf808 100644 --- a/scripts/[clientscript,script4644].cs2 +++ b/scripts/[clientscript,script4644].cs2 @@ -1,6 +1,6 @@ // 4644 [clientscript,script4644] -if (_7033("player_name", 2) = true) { +if (highlight_player_get("player_name", 2) = true) { highlight_player_off("player_name", 2); } else { highlight_player_on("player_name", 2); diff --git a/scripts/[clientscript,script4645].cs2 b/scripts/[clientscript,script4645].cs2 index fb938dfee..4493f204a 100644 --- a/scripts/[clientscript,script4645].cs2 +++ b/scripts/[clientscript,script4645].cs2 @@ -1,6 +1,6 @@ // 4645 [clientscript,script4645] -if (_7033("player_name", 3) = true) { +if (highlight_player_get("player_name", 3) = true) { highlight_player_off("player_name", 3); } else { highlight_player_on("player_name", 3); diff --git a/scripts/[clientscript,script4646].cs2 b/scripts/[clientscript,script4646].cs2 index 5d1c855d1..af2a74825 100644 --- a/scripts/[clientscript,script4646].cs2 +++ b/scripts/[clientscript,script4646].cs2 @@ -1,7 +1,7 @@ // 4646 [clientscript,script4646] -if (_7038(_6950, 1, 1) = true) { - highlight_tile_off(_6950, 1, 1); +if (highlight_tile_get(tile_coord, 1, 1) = true) { + highlight_tile_off(tile_coord, 1, 1); } else { - highlight_tile_on(_6950, 1, 1); + highlight_tile_on(tile_coord, 1, 1); } diff --git a/scripts/[clientscript,script4647].cs2 b/scripts/[clientscript,script4647].cs2 index 4823433df..6248e3e44 100644 --- a/scripts/[clientscript,script4647].cs2 +++ b/scripts/[clientscript,script4647].cs2 @@ -1,7 +1,7 @@ // 4647 [clientscript,script4647] -if (_7038(_6950, 2, 1) = true) { - highlight_tile_off(_6950, 2, 1); +if (highlight_tile_get(tile_coord, 2, 1) = true) { + highlight_tile_off(tile_coord, 2, 1); } else { - highlight_tile_on(_6950, 2, 1); + highlight_tile_on(tile_coord, 2, 1); } diff --git a/scripts/[clientscript,script4762].cs2 b/scripts/[clientscript,script4762].cs2 index 05770e29d..c6f22cf29 100644 --- a/scripts/[clientscript,script4762].cs2 +++ b/scripts/[clientscript,script4762].cs2 @@ -3,8 +3,8 @@ if (~on_enhanced_desktop = 0) { return; } -if (_7038(_6950, 6, 1) = true) { - highlight_tile_off(_6950, 6, 1); +if (highlight_tile_get(tile_coord, 6, 1) = true) { + highlight_tile_off(tile_coord, 6, 1); } else { - highlight_tile_on(_6950, 6, 1); + highlight_tile_on(tile_coord, 6, 1); } diff --git a/scripts/[clientscript,script4763].cs2 b/scripts/[clientscript,script4763].cs2 index b651690e0..45021f324 100644 --- a/scripts/[clientscript,script4763].cs2 +++ b/scripts/[clientscript,script4763].cs2 @@ -6,7 +6,7 @@ if (~on_enhanced_desktop = 0) { def_int $colour6 = ~script5329(^setting_tile_highlight_colour_colour); ~settings_colour_input_update($component0, $int1, $struct2, $setting3, $component4, $int5); if (%varbit12342 = 0) { - _7035(6, $colour6, 2, 50, 90); + highlight_tile_setup(6, $colour6, 2, 50, 90); } else { - _7035(6, null, 0, 0, 64); + highlight_tile_setup(6, null, 0, 0, 64); } diff --git a/scripts/[clientscript,script4764].cs2 b/scripts/[clientscript,script4764].cs2 index 822e972e1..8986ae2f5 100644 --- a/scripts/[clientscript,script4764].cs2 +++ b/scripts/[clientscript,script4764].cs2 @@ -3,4 +3,4 @@ if (~on_enhanced_desktop = 0) { return; } -_7039(6); +highlight_tile_clear(6); diff --git a/scripts/[clientscript,script5547].cs2 b/scripts/[clientscript,script5547].cs2 deleted file mode 100644 index 0b86ea334..000000000 --- a/scripts/[clientscript,script5547].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 5547 -[clientscript,script5547] -~popout_tooltip_clear; diff --git a/scripts/[clientscript,script5721].cs2 b/scripts/[clientscript,script5721].cs2 index f90c29512..410b64cf6 100644 --- a/scripts/[clientscript,script5721].cs2 +++ b/scripts/[clientscript,script5721].cs2 @@ -1,6 +1,6 @@ // 5721 [clientscript,script5721](entityoverlay $entityoverlay0, loc $loc1, coord $coord2) ~script5724($entityoverlay0, $loc1, $coord2); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { ~helper_agility_vartransmit($entityoverlay0, $loc1, $coord2); } diff --git a/scripts/[clientscript,script5967].cs2 b/scripts/[clientscript,script5967].cs2 index daa8e6598..d07d97dac 100644 --- a/scripts/[clientscript,script5967].cs2 +++ b/scripts/[clientscript,script5967].cs2 @@ -5,5 +5,5 @@ if (~on_mobile = false) { } ~script5966; ~debug_mes("Sending event: <$string0>"); -_3180($string0); -_3178($string0); +marketing_sendattributionevent($string0); +marketing_sendanalyticsevent($string0); diff --git a/scripts/[clientscript,script6499].cs2 b/scripts/[clientscript,script6499].cs2 index 87e563733..c4b82f466 100644 --- a/scripts/[clientscript,script6499].cs2 +++ b/scripts/[clientscript,script6499].cs2 @@ -4,7 +4,7 @@ if (loc_find($coord4, $loc2) = true) { if ($int6 = %varbit14189 & $dbrow1 = %var3546 & %varbit14184 = $int7 & %varbit14182 = $int8) { return; } else if (%var3546 ! $dbrow1 | %varbit14182 = 0) { - _7211(5); + entityoverlay_delete_loc(5); highlight_loc_off($loc2, $coord4, 9, 1); } ~script6498($dbrow1, $loc2, $obj3, $coord4, $obj5); diff --git a/scripts/[clientscript,script6502].cs2 b/scripts/[clientscript,script6502].cs2 index 33840f9c9..1493975c1 100644 --- a/scripts/[clientscript,script6502].cs2 +++ b/scripts/[clientscript,script6502].cs2 @@ -1,10 +1,10 @@ // 6502 [clientscript,script6502](dbrow $dbrow0, coord $coord1, obj $obj2, int $int3, npc_uid $npc_uid4, npc_uid $npc_uid5, npc_uid $npc_uid6, dbrow $dbrow7, int $int8, int $int9) -if (_6951($coord1) = true) { +if (tile_find($coord1) = true) { if ($int3 = %varbit14189 & $dbrow0 = %var3546 & $npc_uid4 = %var3548 & $npc_uid5 = %var3549 & $npc_uid6 = %var3550 & $dbrow7 = %var3547 & %varbit14182 = $int8 & %varbit14184 = $int9) { return; } else if (%var3546 ! $dbrow0 | %varbit14182 = 0) { - _7214($coord1, 7); + entityoverlay_delete_coord($coord1, 7); highlight_tile_off($coord1, 9, 1); } ~script6501($dbrow0, $coord1, $obj2); diff --git a/scripts/[clientscript,script6508].cs2 b/scripts/[clientscript,script6508].cs2 index f93de6d7e..17ac4418d 100644 --- a/scripts/[clientscript,script6508].cs2 +++ b/scripts/[clientscript,script6508].cs2 @@ -4,7 +4,7 @@ if (loc_find($coord4, $loc3) = true) { if ($int6 = %varbit14189 & $int7 = %varbit14164 & $dbrow1 = %var3546 & %varbit14182 = $int9 & %varbit14184 = $int8) { return; } else if (%var3546 ! $dbrow1 | %varbit14182 = 0) { - _7211(5); + entityoverlay_delete_loc(5); highlight_loc_off($loc3, $coord4, 9, 1); } ~script6507($dbrow1, $dbrow2, $loc3, $coord4, $obj5); diff --git a/scripts/[clientscript,script6529].cs2 b/scripts/[clientscript,script6529].cs2 index 39c1afc61..2dfd1db8c 100644 --- a/scripts/[clientscript,script6529].cs2 +++ b/scripts/[clientscript,script6529].cs2 @@ -3,11 +3,11 @@ if (%varbit4269 = $int7 & %varbit14189 = $int3 & %var3548 = $npc_uid4 & %var3547 = $dbrow5 & %var3546 = $dbrow6) { return; } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("script6529($entityoverlay0, $npc_uid1, $int2, %varbit14189, %var3548, %var3547, %var3546, %varbit4269){var3543, var3546, var3548, var3547, var1115}"); } highlight_npc_off($npc_uid1, $int2, 9); -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); if (%varbit4269 < 1) { return; } diff --git a/scripts/[clientscript,script6530].cs2 b/scripts/[clientscript,script6530].cs2 index b33869e53..60d41a3c9 100644 --- a/scripts/[clientscript,script6530].cs2 +++ b/scripts/[clientscript,script6530].cs2 @@ -3,11 +3,11 @@ if (%var292 = $int7 & %varbit14189 = $int3 & %var3548 = $npc_uid4 & %var3547 = $dbrow5 & %var3546 = $dbrow6) { return; } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("script6530($entityoverlay0, $npc_uid1, $int2, %varbit14189, %var3548, %var3547, %var3546, %var292, $int8){var3543, var3546, var3548, var3547, var292}"); } highlight_npc_off($npc_uid1, $int2, 9); -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); if (testbit(%var292, 6) = ^false) { if (npc_finduid($npc_uid1) = true) { ~loadnpc_cluehelper_uri_overlay($entityoverlay0, $npc_uid1, $int2); diff --git a/scripts/[clientscript,script6531].cs2 b/scripts/[clientscript,script6531].cs2 index a19db7810..a60ff7435 100644 --- a/scripts/[clientscript,script6531].cs2 +++ b/scripts/[clientscript,script6531].cs2 @@ -3,11 +3,11 @@ if (%varbit5190 = $int7 & %varbit14189 = $int3 & %var3548 = $npc_uid4 & %var3547 = $dbrow5 & %var3546 = $dbrow6) { return; } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("script6531($entityoverlay0, $npc_uid1, $int2, %varbit14189, %var3548, %var3547, %var3546, %varbit5190){var3543, var3546, var3548, var3547, var1353}"); } highlight_npc_off($npc_uid1, $int2, 9); -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); if (npc_finduid($npc_uid1) = true) { if (%varbit5190 = 0) { ~script6533($entityoverlay0, $npc_uid1, $int2); diff --git a/scripts/[clientscript,script6544].cs2 b/scripts/[clientscript,script6544].cs2 index 6e6cd9344..139dd6514 100644 --- a/scripts/[clientscript,script6544].cs2 +++ b/scripts/[clientscript,script6544].cs2 @@ -3,6 +3,6 @@ if (%varbit14189 = $int3 & %var3546 = $dbrow4 & ~script6545($int5) = $npc_uid6) { return; } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { ~script6543($entityoverlay0, $int1, $npc_uid2, $npc7); } diff --git a/scripts/[clientscript,script6560].cs2 b/scripts/[clientscript,script6560].cs2 index 040582bb9..2372a2be9 100644 --- a/scripts/[clientscript,script6560].cs2 +++ b/scripts/[clientscript,script6560].cs2 @@ -5,12 +5,12 @@ if_sethide(true, welcome_screen:81); def_string $string0 = ""; def_string $string1 = ""; if (cc_find(welcome_screen:80, 0) = ^true) { - if (cc_getcrm_hasresponse = true & (cc_getcrm_int("main_save_only") ! 1 | ~script7043 = 0)) { - if (cc_getcrm_int("target_is_url") ! 1) { + if (cc_crmview_gethasresponse = true & (cc_crmview_getint("main_save_only") ! 1 | ~script7043 = 0)) { + if (cc_crmview_getint("target_is_url") ! 1) { ~script6559; } - $string0 = cc_getcrm_string("op_text"); - $string1 = cc_getcrm_string("op_text_ios"); + $string0 = cc_crmview_getstring("op_text"); + $string1 = cc_crmview_getstring("op_text_ios"); if (string_length($string0) <= 0) { $string0 = "Select"; } diff --git a/scripts/[clientscript,script6677].cs2 b/scripts/[clientscript,script6677].cs2 index 9978caa10..9ef13a0fa 100644 --- a/scripts/[clientscript,script6677].cs2 +++ b/scripts/[clientscript,script6677].cs2 @@ -3,7 +3,7 @@ if ($int2 = %var3) { return; } -if (_203($entityoverlay0, 0) = ^true) { +if (cc_find_entityoverlay($entityoverlay0, 0) = ^true) { cc_settext(tostring(%var3)); cc_setonvartransmit("script6677($entityoverlay0, $coord1, %var3){var3}"); if (%var3 <= 0) { diff --git a/scripts/[clientscript,script6678].cs2 b/scripts/[clientscript,script6678].cs2 index af12e1710..f64c1cf66 100644 --- a/scripts/[clientscript,script6678].cs2 +++ b/scripts/[clientscript,script6678].cs2 @@ -6,4 +6,4 @@ if (~on_enhanced_any = 0) { if ($coord0 = null) { return; } -_7214($coord0, 1); +entityoverlay_delete_coord($coord0, 1); diff --git a/scripts/[clientscript,script6686].cs2 b/scripts/[clientscript,script6686].cs2 index 12c049595..5c03d4d2c 100644 --- a/scripts/[clientscript,script6686].cs2 +++ b/scripts/[clientscript,script6686].cs2 @@ -3,6 +3,6 @@ if (~on_enhanced_desktop = 0) { return; } -_7004(6); -_7044(6); +highlight_npc_clear(6); +highlight_group_clear(6); %varcint1079 = calc(clientclock + 10); diff --git a/scripts/[clientscript,script6688].cs2 b/scripts/[clientscript,script6688].cs2 index 746c8c0a2..0004dcb17 100644 --- a/scripts/[clientscript,script6688].cs2 +++ b/scripts/[clientscript,script6688].cs2 @@ -3,7 +3,7 @@ if (~on_enhanced_desktop = 0) { return; } -if (_7003(npc_uid, npc_spawncycle, 6) = true) { +if (highlight_npc_get(npc_uid, npc_spawncycle, 6) = true) { highlight_npc_off(npc_uid, npc_spawncycle, 6); } else { highlight_npc_on(npc_uid, npc_spawncycle, 6); diff --git a/scripts/[clientscript,script6689].cs2 b/scripts/[clientscript,script6689].cs2 index 76ccf779e..8e52776c1 100644 --- a/scripts/[clientscript,script6689].cs2 +++ b/scripts/[clientscript,script6689].cs2 @@ -4,9 +4,9 @@ if (~on_enhanced_desktop = 0) { return; } def_string $string0 = ~script6690(npc_type); -if (_7043($string0, 6) = true) { - _7042($string0, 6); +if (highlight_group_get($string0, 6) = true) { + highlight_group_off($string0, 6); } else { - _7041($string0, 6); + highlight_group_on($string0, 6); } %varcint1079 = calc(clientclock + 10); diff --git a/scripts/[clientscript,script6776].cs2 b/scripts/[clientscript,script6776].cs2 deleted file mode 100644 index a796fba41..000000000 --- a/scripts/[clientscript,script6776].cs2 +++ /dev/null @@ -1,16 +0,0 @@ -// 6776 -[clientscript,script6776](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10) -def_component $component11 = interface_516:1; -def_component $component12 = interface_516:0; -if ($component12 ! null) { - ~script7091($component11, $component12, ^min_32bit_int, ^min_32bit_int, $component6, $component2); -} -~steelborder($component0, "Makeover", 0); -~script7070($component1, $component2, $component3, $component4, $component5, $component6, $component10); -~script7077($component4); -%varcint1148 = %var3788; -%varcint1150 = 0; -%varcint1151 = 0; -%varcint1153 = 0; -if_setonvartransmit("script7069($component1, $component2, $component3, $component4, $component5, $component6, $component10){var3787, var3789, var3788}", $component1); -~script7083($component7, $component8, $component9, -1); diff --git a/scripts/[clientscript,script7033].cs2 b/scripts/[clientscript,script7033].cs2 index f5357432d..a34504ffe 100644 --- a/scripts/[clientscript,script7033].cs2 +++ b/scripts/[clientscript,script7033].cs2 @@ -3,12 +3,12 @@ cc_deleteall(interface_284:2); def_string $string1 = ""; if (cc_find(interface_284:5, 0) = ^true) { - if (cc_getcrm_hasresponse = true & (cc_getcrm_int("main_save_only") ! 1 | ~script7043 = 0)) { - if (cc_getcrm_int("target_is_url") ! 1) { + if (cc_crmview_gethasresponse = true & (cc_crmview_getint("main_save_only") ! 1 | ~script7043 = 0)) { + if (cc_crmview_getint("target_is_url") ! 1) { ~script7034; } - $string0 = cc_getcrm_string("op_text"); - $string1 = cc_getcrm_string("op_text_ios"); + $string0 = cc_crmview_getstring("op_text"); + $string1 = cc_crmview_getstring("op_text_ios"); if (string_length($string0) <= 0) { $string0 = "Select"; } diff --git a/scripts/[clientscript,script7057].cs2 b/scripts/[clientscript,script7057].cs2 deleted file mode 100644 index fdfb6c348..000000000 --- a/scripts/[clientscript,script7057].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7057 -[clientscript,script7057](int $int0, int $int1, int $int2, int $int3, int $int4, component $component5) -~script7058($int0, $int1, $int2, $int3, $int4, $component5); diff --git a/scripts/[clientscript,script7059].cs2 b/scripts/[clientscript,script7059].cs2 deleted file mode 100644 index d463c949f..000000000 --- a/scripts/[clientscript,script7059].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7059 -[clientscript,script7059](int $int0, int $int1, int $int2, component $component3) -~script7060($int0, $int1, $int2, $component3); diff --git a/scripts/[clientscript,script7061].cs2 b/scripts/[clientscript,script7061].cs2 deleted file mode 100644 index badc4e4a7..000000000 --- a/scripts/[clientscript,script7061].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7061 -[clientscript,script7061](int $int0, int $int1, int $int2, int $int3, component $component4) -~script7062($int0, $int1, $int2, calc($int3 - clientclock), $component4); diff --git a/scripts/[clientscript,script7069].cs2 b/scripts/[clientscript,script7069].cs2 index c61b9dd6e..faccd60a1 100644 --- a/scripts/[clientscript,script7069].cs2 +++ b/scripts/[clientscript,script7069].cs2 @@ -1,3 +1,3 @@ // 7069 [clientscript,script7069](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6) -~script7070($component0, $component1, $component2, $component3, $component4, $component5, $component6); +~makeover_draw_content($component0, $component1, $component2, $component3, $component4, $component5, $component6); diff --git a/scripts/[clientscript,script7082].cs2 b/scripts/[clientscript,script7082].cs2 index aee03596d..a497121ad 100644 --- a/scripts/[clientscript,script7082].cs2 +++ b/scripts/[clientscript,script7082].cs2 @@ -1,4 +1,4 @@ // 7082 [clientscript,script7082](component $component0) sound_synth(interface_select1, 1, 0); -~script7068($component0, 1); +~makeover_draw_select_button($component0, 1); diff --git a/scripts/[clientscript,script7089].cs2 b/scripts/[clientscript,script7089].cs2 deleted file mode 100644 index 85fcc1074..000000000 --- a/scripts/[clientscript,script7089].cs2 +++ /dev/null @@ -1,5 +0,0 @@ -// 7089 -[clientscript,script7089](component $component0, int $comsubid1, int $colour2) -if (cc_find($component0, $comsubid1) = ^true) { - cc_setcolour($colour2); -} diff --git a/scripts/[clientscript,script7090].cs2 b/scripts/[clientscript,script7090].cs2 deleted file mode 100644 index 26943395d..000000000 --- a/scripts/[clientscript,script7090].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7090 -[clientscript,script7090](component $component0, component $component1, int $width2, int $height3, component $component4, component $component5) -~script7091($component0, $component1, $width2, $height3, $component4, $component5); diff --git a/scripts/[clientscript,script7102].cs2 b/scripts/[clientscript,script7102].cs2 index 2b99fe978..ed9b59378 100644 --- a/scripts/[clientscript,script7102].cs2 +++ b/scripts/[clientscript,script7102].cs2 @@ -53,20 +53,20 @@ def_int $comsubid19 = $int18; $int18 = calc($int18 + 1); cc_setsize(calc($int10 + 10), calc($int11 + 10), $setsize12, $setsize13); cc_setposition($x14, $y15, $setposh16, $setposv17); -cc_setinput_width(cc_getwidth); +cc_input_setwidth(cc_getwidth); cc_settextfont(p12_full); cc_setcolour(^white); cc_settextshadow(true); cc_settextalign(^settextalign_left, ^settextalign_top, 0); -cc_setinput_submitmode(0); -cc_setinput_wrapmode(1); -cc_setinput_selectcolour(^black); -cc_setinput_selectbgcolour(^white); -cc_setinput_acceptmode(0); +cc_input_setsubmitmode(0); +cc_input_setwrapmode(1); +cc_input_setselectcolour(^black); +cc_input_setselectbgcolour(^white); +cc_input_setacceptmode(0); def_string $string0 = ~script7105($struct3); cc_settext($string0); -cc_setinput_focus(true); -cc_setinput_caret(string_length($string0)); +cc_input_setfocus(true); +cc_input_setcaret(string_length($string0)); ~clan_stonebutton_init("Cancel", interface_82:9, "p12_full"); if_setonop("script4208(0, interface_82:1, interface_82:2, interface_82:3, $component0)", interface_82:9); ~clan_stonebutton_init("Save", interface_82:10, "p12_full"); diff --git a/scripts/[clientscript,script7121].cs2 b/scripts/[clientscript,script7121].cs2 deleted file mode 100644 index 6c44b1e83..000000000 --- a/scripts/[clientscript,script7121].cs2 +++ /dev/null @@ -1,8 +0,0 @@ -// 7121 -[clientscript,script7121](entityoverlay $entityoverlay0, int $comsubid1, graphic $graphic2, component $component3) -if (_203($entityoverlay0, $comsubid1) = ^true) { - cc_setgraphic($graphic2); -} -if ($component3 ! null) { - ~deltooltip_action($component3); -} diff --git a/scripts/[clientscript,script7130].cs2 b/scripts/[clientscript,script7130].cs2 index 4811cdb7b..85dee6f33 100644 --- a/scripts/[clientscript,script7130].cs2 +++ b/scripts/[clientscript,script7130].cs2 @@ -3,4 +3,4 @@ sound_synth(interface_select1, 1, 0); ~script5770($component0, $component1, $count2, $enum3, $colour4); %varbit14883 = $count2; -~script7132; +~loottools_size; diff --git a/scripts/[clientscript,script7131].cs2 b/scripts/[clientscript,script7131].cs2 deleted file mode 100644 index 0e5ac0c33..000000000 --- a/scripts/[clientscript,script7131].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7131 -[clientscript,script7131] -~script7132; diff --git a/scripts/[clientscript,script7179].cs2 b/scripts/[clientscript,script7179].cs2 index 30070c6c3..b85737653 100644 --- a/scripts/[clientscript,script7179].cs2 +++ b/scripts/[clientscript,script7179].cs2 @@ -6,7 +6,7 @@ def_int $int3 = -1; def_component $component4 = null; switch_int ($opindex0) { case 1 : - if_setfillcolour(calc(1 - if_getfillcolour($component2)), $component2); + if_setgradientcolour(calc(1 - if_getfillcolour($component2)), $component2); ~script7133; case 2 : $int3 = 0; @@ -23,7 +23,7 @@ switch_int ($opindex0) { } $int3 = calc($int3 + 1); } - _7614(if_gettext($component2)); + loottracker_lootdel_byname(if_gettext($component2)); ~script7166; $int3 = 0; while ($int3 < 10) { @@ -31,7 +31,7 @@ switch_int ($opindex0) { if ($intarray0($int3) = -1) { $intarray0($int3) = 0; } - if_setfillcolour($intarray0($int3), $component4); + if_setgradientcolour($intarray0($int3), $component4); $int3 = calc($int3 + 1); } ~script7133; diff --git a/scripts/[clientscript,script7181].cs2 b/scripts/[clientscript,script7181].cs2 index 2d68a8df2..45c1f0895 100644 --- a/scripts/[clientscript,script7181].cs2 +++ b/scripts/[clientscript,script7181].cs2 @@ -15,7 +15,7 @@ $int2 = 0; while ($int2 < 10) { $component0 = ~script7168($int2); if (string_length(if_gettext($component0)) > 0) { - if_setfillcolour($int1, $component0); + if_setgradientcolour($int1, $component0); } $int2 = calc($int2 + 1); } diff --git a/scripts/[clientscript,script7189].cs2 b/scripts/[clientscript,script7189].cs2 deleted file mode 100644 index 2f7fa91cf..000000000 --- a/scripts/[clientscript,script7189].cs2 +++ /dev/null @@ -1,5 +0,0 @@ -// 7189 -[clientscript,script7189] -_7613; -~script7166; -~script7133; diff --git a/scripts/[clientscript,script7191].cs2 b/scripts/[clientscript,script7191].cs2 index ea1f67199..1ef8e3b21 100644 --- a/scripts/[clientscript,script7191].cs2 +++ b/scripts/[clientscript,script7191].cs2 @@ -1,8 +1,8 @@ // 7191 -[clientscript,script7191](npc $npc0, int $int1, obj $obj2, int $int3) +[clientscript,script7191](npc $npc0, int $int1, int $int2, int $int3) def_string $string0 = removetags(nc_name($npc0)); if (string_length($string0) = 0) { return; } -_7600($string0, $obj2, $int3, $int1); +loottracker_sourceadd($string0, $int2, $int3, $int1); ~script7159($string0, 1); diff --git a/scripts/[clientscript,script7192].cs2 b/scripts/[clientscript,script7192].cs2 index 5d01a5b9e..fbba48859 100644 --- a/scripts/[clientscript,script7192].cs2 +++ b/scripts/[clientscript,script7192].cs2 @@ -5,5 +5,5 @@ if (string_length($string0) = 0) { return; } $obj2 = oc_uncert($obj2); -_7628($string0, $obj2, $int3, $int1); +loottracker_lootadd($string0, $obj2, $int3, $int1); ~script7158($string0, $obj2, $int3); diff --git a/scripts/[clientscript,script7193].cs2 b/scripts/[clientscript,script7193].cs2 index cff00603f..8d2422afd 100644 --- a/scripts/[clientscript,script7193].cs2 +++ b/scripts/[clientscript,script7193].cs2 @@ -1,8 +1,8 @@ // 7193 -[clientscript,script7193](loc $loc0, int $int1, obj $obj2, int $int3) +[clientscript,script7193](loc $loc0, int $int1, int $int2, int $int3) def_string $string0 = removetags(lc_name($loc0)); if (string_length($string0) = 0) { return; } -_7600($string0, $obj2, $int3, $int1); +loottracker_sourceadd($string0, $int2, $int3, $int1); ~script7159($string0, 1); diff --git a/scripts/[clientscript,script7194].cs2 b/scripts/[clientscript,script7194].cs2 index 454684740..0b5728fc8 100644 --- a/scripts/[clientscript,script7194].cs2 +++ b/scripts/[clientscript,script7194].cs2 @@ -5,5 +5,5 @@ if (string_length($string0) = 0) { return; } $obj2 = oc_uncert($obj2); -_7628($string0, $obj2, $int3, $int1); +loottracker_lootadd($string0, $obj2, $int3, $int1); ~script7158($string0, $obj2, $int3); diff --git a/scripts/[clientscript,script7195].cs2 b/scripts/[clientscript,script7195].cs2 index 5bd793c1c..d3ac6d34f 100644 --- a/scripts/[clientscript,script7195].cs2 +++ b/scripts/[clientscript,script7195].cs2 @@ -1,8 +1,8 @@ // 7195 -[clientscript,script7195](obj $obj0, int $int1, obj $obj2, int $int3) +[clientscript,script7195](obj $obj0, int $int1, int $int2, int $int3) def_string $string0 = removetags(oc_name($obj0)); if (string_length($string0) = 0) { return; } -_7600($string0, $obj2, $int3, $int1); +loottracker_sourceadd($string0, $int2, $int3, $int1); ~script7159($string0, 1); diff --git a/scripts/[clientscript,script7196].cs2 b/scripts/[clientscript,script7196].cs2 index 2a1949538..407652df8 100644 --- a/scripts/[clientscript,script7196].cs2 +++ b/scripts/[clientscript,script7196].cs2 @@ -5,5 +5,5 @@ if (string_length($string0) = 0) { return; } $obj2 = oc_uncert($obj2); -_7628($string0, $obj2, $int3, $int1); +loottracker_lootadd($string0, $obj2, $int3, $int1); ~script7158($string0, $obj2, $int3); diff --git a/scripts/[clientscript,script7197].cs2 b/scripts/[clientscript,script7197].cs2 index 7af36105c..42f6e1077 100644 --- a/scripts/[clientscript,script7197].cs2 +++ b/scripts/[clientscript,script7197].cs2 @@ -1,8 +1,8 @@ // 7197 -[clientscript,script7197](int $int0, int $int1, obj $obj2, int $int3) +[clientscript,script7197](int $int0, int $int1, int $int2, int $int3) def_string $string0 = enum(int, string, enum_4976, $int0); if (string_length($string0) = 0) { return; } -_7600($string0, $obj2, $int3, $int1); +loottracker_sourceadd($string0, $int2, $int3, $int1); ~script7159($string0, 1); diff --git a/scripts/[clientscript,script7198].cs2 b/scripts/[clientscript,script7198].cs2 index beedd4b03..e2d56697b 100644 --- a/scripts/[clientscript,script7198].cs2 +++ b/scripts/[clientscript,script7198].cs2 @@ -5,5 +5,5 @@ if (string_length($string0) = 0) { return; } $obj2 = oc_uncert($obj2); -_7628($string0, $obj2, $int3, $int1); +loottracker_lootadd($string0, $obj2, $int3, $int1); ~script7158($string0, $obj2, $int3); diff --git a/scripts/[clientscript,script7205].cs2 b/scripts/[clientscript,script7205].cs2 deleted file mode 100644 index a0517778e..000000000 --- a/scripts/[clientscript,script7205].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7205 -[clientscript,script7205] -~script7206; diff --git a/scripts/[clientscript,script7207].cs2 b/scripts/[clientscript,script7207].cs2 deleted file mode 100644 index 8f7f7df5f..000000000 --- a/scripts/[clientscript,script7207].cs2 +++ /dev/null @@ -1,4 +0,0 @@ -// 7207 -[clientscript,script7207](component $component0, int $comsubid1) -%varbit14869 = calc(1 - %varbit14869); -~script7209($component0, $comsubid1); diff --git a/scripts/[clientscript,script7208].cs2 b/scripts/[clientscript,script7208].cs2 deleted file mode 100644 index 1f66cbedb..000000000 --- a/scripts/[clientscript,script7208].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7208 -[clientscript,script7208](component $component0, int $comsubid1) -~script7209($component0, $comsubid1); diff --git a/scripts/[clientscript,script7214].cs2 b/scripts/[clientscript,script7214].cs2 deleted file mode 100644 index e3b7caa0e..000000000 --- a/scripts/[clientscript,script7214].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7214 -[clientscript,script7214] -return; diff --git a/scripts/[clientscript,script7215].cs2 b/scripts/[clientscript,script7215].cs2 deleted file mode 100644 index f08ad97b9..000000000 --- a/scripts/[clientscript,script7215].cs2 +++ /dev/null @@ -1,10 +0,0 @@ -// 7215 -[clientscript,script7215](component $component0, int $comsubid1, stringvector $stringvector2) -if ($comsubid1 ! -1) { - if (cc_find($component0, $comsubid1) = ^true & _1624 = true) { - return; - } -} else if (_2624($component0) = true) { - return; -} -~script7216($component0, $comsubid1, $stringvector2); diff --git a/scripts/[clientscript,script7220].cs2 b/scripts/[clientscript,script7220].cs2 deleted file mode 100644 index 169a7bca6..000000000 --- a/scripts/[clientscript,script7220].cs2 +++ /dev/null @@ -1,7 +0,0 @@ -// 7220 -[clientscript,script7220](stringvector $stringvector0, int $int1) -_7409($stringvector0); -%varcint1154 = calc(clientclock + 1); -if ($int1 = 1) { - ~script7206; -} diff --git a/scripts/[clientscript,script7229].cs2 b/scripts/[clientscript,script7229].cs2 deleted file mode 100644 index 515bb11bf..000000000 --- a/scripts/[clientscript,script7229].cs2 +++ /dev/null @@ -1,3 +0,0 @@ -// 7229 -[clientscript,script7229](coord $coord0) -~script7227($coord0); diff --git a/scripts/[clientscript,script7230].cs2 b/scripts/[clientscript,script7230].cs2 deleted file mode 100644 index b865c15bd..000000000 --- a/scripts/[clientscript,script7230].cs2 +++ /dev/null @@ -1,5 +0,0 @@ -// 7230 -[clientscript,script7230](int $key0, coord $coord1) -if ($key0 = %varbit14877) { - ~script7227($coord1); -} diff --git a/scripts/[clientscript,script7231].cs2 b/scripts/[clientscript,script7231].cs2 index c88b7d655..91bedadcc 100644 --- a/scripts/[clientscript,script7231].cs2 +++ b/scripts/[clientscript,script7231].cs2 @@ -13,7 +13,7 @@ if ($int4 = 0) { } def_int $int6 = 0; def_int $int7 = 0; -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setontimer(null); if ($int3 ! -1) { $int6, $int7 = stockmarket_getvalue(cabbage_1965); @@ -22,5 +22,5 @@ if (_202($entityoverlay0) = ^true) { return; } } - ~script7227($coord1); + ~ground_items_setup($coord1); } diff --git a/scripts/[clientscript,script7235].cs2 b/scripts/[clientscript,script7235].cs2 index 0dd011951..6e2b8569c 100644 --- a/scripts/[clientscript,script7235].cs2 +++ b/scripts/[clientscript,script7235].cs2 @@ -20,14 +20,14 @@ if (calc($int11 % 10) = 0) { if ($int12 <= 0) { if ($boolean7 = true) { return; - } else if (_203($entityoverlay0, $comsubid1) = ^true & _203($entityoverlay0, $comsubid8) = ^true) { + } else if (cc_find_entityoverlay($entityoverlay0, $comsubid1) = ^true & cc_find_entityoverlay($entityoverlay0, $comsubid8) = ^true) { .cc_setgraphic($graphic13); .cc_setposition(calc(0 - $width9 / 2 - 10), $y10, ^setpos_abs_centre, ^setpos_abs_bottom); cc_settext(""); cc_setontimer(null); return; } - } else if (_203($entityoverlay0, $comsubid1) = ^true & _203($entityoverlay0, $comsubid8) = ^true) { + } else if (cc_find_entityoverlay($entityoverlay0, $comsubid1) = ^true & cc_find_entityoverlay($entityoverlay0, $comsubid8) = ^true) { cc_settext("[<~buff_bar_time_string($int12)>]"); cc_setcolour(~script7244($int12, $colour5)); .cc_setgraphic($graphic13); diff --git a/scripts/[clientscript,script876].cs2 b/scripts/[clientscript,script876].cs2 index dc02fce6b..8e1c293ce 100644 --- a/scripts/[clientscript,script876].cs2 +++ b/scripts/[clientscript,script876].cs2 @@ -21,4 +21,4 @@ chat_settimestamps(%varbit12384); ~rebuildchatbox(~script553); ~script6465; _7462(5, 3); -~script7190; +~loottracker_login; diff --git a/scripts/[clientscript,settings_interface_scaling].cs2 b/scripts/[clientscript,settings_interface_scaling].cs2 index bc7987129..955f6718e 100644 --- a/scripts/[clientscript,settings_interface_scaling].cs2 +++ b/scripts/[clientscript,settings_interface_scaling].cs2 @@ -6,4 +6,4 @@ if (~on_enhanced_desktop = 0) { ~settings_interface_scaling($int0); def_int $int1 = calc(100 + $int0 * 10); $int1 = ~max(100, ~min(400, $int1)); -_6210($int1); +uizoom_set($int1); diff --git a/scripts/[clientscript,script7096].cs2 b/scripts/[clientscript,settings_meslayer_close].cs2 similarity index 79% rename from scripts/[clientscript,script7096].cs2 rename to scripts/[clientscript,settings_meslayer_close].cs2 index 7427aff6c..d524c1ff6 100644 --- a/scripts/[clientscript,script7096].cs2 +++ b/scripts/[clientscript,settings_meslayer_close].cs2 @@ -1,5 +1,5 @@ // 7096 -[clientscript,script7096](int $int0) +[clientscript,settings_meslayer_close](int $int0) def_int $int1 = 1; if (%varbit9647 = 1 | %varbit12284 = 1 | %varbit14816 = 1) { $int1 = 0; diff --git a/scripts/[clientscript,script7025].cs2 b/scripts/[clientscript,settings_minimap_zoom_op].cs2 similarity index 66% rename from scripts/[clientscript,script7025].cs2 rename to scripts/[clientscript,settings_minimap_zoom_op].cs2 index 2386da8bd..a5179c839 100644 --- a/scripts/[clientscript,script7025].cs2 +++ b/scripts/[clientscript,settings_minimap_zoom_op].cs2 @@ -1,5 +1,5 @@ // 7025 -[clientscript,script7025](component $component0, int $comsubid1, int $int2, int $int3, int $y4, int $int5, int $int6, component $component7, int $int8) +[clientscript,settings_minimap_zoom_op](component $component0, int $comsubid1, int $int2, int $int3, int $y4, int $int5, int $int6, component $component7, int $int8) if_setposition($int5, $y4, ^setpos_abs_left, ^setpos_abs_top, $component7); if_setsize($int3, 16, ^setsize_abs, ^setsize_abs, $component7); def_int $int9 = calc($int3 - 16); diff --git a/scripts/[clientscript,smokeoverlay_init].cs2 b/scripts/[clientscript,smokeoverlay_init].cs2 index 4f8b23bca..b0b8c8c48 100644 --- a/scripts/[clientscript,smokeoverlay_init].cs2 +++ b/scripts/[clientscript,smokeoverlay_init].cs2 @@ -7,7 +7,7 @@ cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_bottom); cc_setfill(true); if_setmodeltransparent(true, smokeoverlay:1); cc_setcolour(^black); -cc_setfillcolour(0x808080); +cc_setgradientcolour(0x808080); cc_settrans(255); -_1124(64); -_1125(2); +cc_setgradienttrans(64); +cc_setgradientmode(2); diff --git a/scripts/[clientscript,steam_lock_achievements].cs2 b/scripts/[clientscript,steam_lock_achievements].cs2 index d291f6db4..d0feac330 100644 --- a/scripts/[clientscript,steam_lock_achievements].cs2 +++ b/scripts/[clientscript,steam_lock_achievements].cs2 @@ -1,27 +1,27 @@ // 2356 [clientscript,steam_lock_achievements] def_int $int0 = 0; -$int0 = _3700("ANewHero", 0, 0); -$int0 = _3700("CanoeBelieveIt", 0, 0); -$int0 = _3700("RagsToRiches", 0, 0); -$int0 = _3700("Swashbuckler", 0, 0); -$int0 = _3700("HomeSweetHome", 0, 0); -$int0 = _3700("OutForTheCount", 0, 0); -$int0 = _3700("Demonstration", 0, 0); -$int0 = _3700("Fashionscape", 0, 0); -$int0 = _3700("TollDodger", 0, 0); -$int0 = _3700("GetTheBoot", 0, 0); -$int0 = _3700("TisButAScratch", 0, 0); -$int0 = _3700("KillOrBeKilled", 0, 0); -$int0 = _3700("DemocracyInAction", 0, 0); -$int0 = _3700("FishermansFriend", 0, 0); -$int0 = _3700("BreathOfFreshAir", 0, 0); -$int0 = _3700("ReadySteadyCook", 0, 0); -$int0 = _3700("MightySlayer", 0, 0); -$int0 = _3701("UnlimitedPowerStat", 3, 0); -$int0 = _3701("ShopaholicStat", 0, 0); -$int0 = _3701("GettingSomewhereStat", 32, 0); -$int0 = _3700("UnlimitedPower", 0, 0); -$int0 = _3700("Shopaholic", 0, 0); -$int0 = _3700("GettingSomewhere", 0, 0); -$int0 = _3702; +$int0 = steam_setachivement("ANewHero", 0, 0); +$int0 = steam_setachivement("CanoeBelieveIt", 0, 0); +$int0 = steam_setachivement("RagsToRiches", 0, 0); +$int0 = steam_setachivement("Swashbuckler", 0, 0); +$int0 = steam_setachivement("HomeSweetHome", 0, 0); +$int0 = steam_setachivement("OutForTheCount", 0, 0); +$int0 = steam_setachivement("Demonstration", 0, 0); +$int0 = steam_setachivement("Fashionscape", 0, 0); +$int0 = steam_setachivement("TollDodger", 0, 0); +$int0 = steam_setachivement("GetTheBoot", 0, 0); +$int0 = steam_setachivement("TisButAScratch", 0, 0); +$int0 = steam_setachivement("KillOrBeKilled", 0, 0); +$int0 = steam_setachivement("DemocracyInAction", 0, 0); +$int0 = steam_setachivement("FishermansFriend", 0, 0); +$int0 = steam_setachivement("BreathOfFreshAir", 0, 0); +$int0 = steam_setachivement("ReadySteadyCook", 0, 0); +$int0 = steam_setachivement("MightySlayer", 0, 0); +$int0 = steam_setstat("UnlimitedPowerStat", 3, 0); +$int0 = steam_setstat("ShopaholicStat", 0, 0); +$int0 = steam_setstat("GettingSomewhereStat", 32, 0); +$int0 = steam_setachivement("UnlimitedPower", 0, 0); +$int0 = steam_setachivement("Shopaholic", 0, 0); +$int0 = steam_setachivement("GettingSomewhere", 0, 0); +$int0 = steam_storestats; diff --git a/scripts/[clientscript,toa_partydetails_addmember].cs2 b/scripts/[clientscript,toa_partydetails_addmember].cs2 index 4cf6b52ae..706927765 100644 --- a/scripts/[clientscript,toa_partydetails_addmember].cs2 +++ b/scripts/[clientscript,toa_partydetails_addmember].cs2 @@ -78,8 +78,8 @@ if ($int6 = 1) { .cc_setop(1, "Move down"); cc_setopbase("<$string1>"); .cc_setopbase("<$string1>"); - cc_setonop("script5345(%varcint178, true)"); - .cc_setonop("script5345(%varcint178, false)"); + cc_setonop("toa_partydetails_sortmember(%varcint178, true)"); + .cc_setonop("toa_partydetails_sortmember(%varcint178, false)"); } else { cc_sethide(true); .cc_sethide(true); diff --git a/scripts/[clientscript,script5345].cs2 b/scripts/[clientscript,toa_partydetails_sortmember].cs2 similarity index 79% rename from scripts/[clientscript,script5345].cs2 rename to scripts/[clientscript,toa_partydetails_sortmember].cs2 index 73b58d047..4fdbb0908 100644 --- a/scripts/[clientscript,script5345].cs2 +++ b/scripts/[clientscript,toa_partydetails_sortmember].cs2 @@ -1,5 +1,5 @@ // 5345 -[clientscript,script5345](int $int0, boolean $boolean1) +[clientscript,toa_partydetails_sortmember](int $int0, boolean $boolean1) sound_synth(interface_select1, 1, 0); def_int $int2 = calc(enum_getoutputcount(enum_4792) + 8); if ($boolean1 = true) { diff --git a/scripts/[clientscript,toplevel_init].cs2 b/scripts/[clientscript,toplevel_init].cs2 index ae0f931a4..3fc784837 100644 --- a/scripts/[clientscript,toplevel_init].cs2 +++ b/scripts/[clientscript,toplevel_init].cs2 @@ -37,7 +37,7 @@ if ($enum1 = enum_139) { setshowmouseovertext(false); setshowmousecross(false); setshowloadingmessages(false); - _3130("cross", -1); + setclickgraphic("cross", null); _3131(false); } else if ($enum1 = enum_1745) { setshowmouseovertext(true); @@ -54,7 +54,7 @@ if ($enum1 = enum_139) { setshowmouseovertext(true); setshowmousecross(true); setshowloadingmessages(true); - _3130("cross", -1); + setclickgraphic("cross", null); _3131(false); } ~account_update_display; diff --git a/scripts/[clientscript,worldmap_init].cs2 b/scripts/[clientscript,worldmap_init].cs2 index 78bd9331d..833bb12d6 100644 --- a/scripts/[clientscript,worldmap_init].cs2 +++ b/scripts/[clientscript,worldmap_init].cs2 @@ -2,7 +2,7 @@ [clientscript,worldmap_init](component $component0, component $component1, component $layer2, component $component3, component $component4, component $component5, component $component6, component $component7, component $component8, component $component9, component $component10, component $component11, component $component12, component $component13, component $component14, component $component15, component $component16, component $component17, component $component18, component $component19, component $component20, component $component21, component $component22, component $component23, component $component24) ~script4729($component1, null, setbit(0, 13), ^setpos_abs_centre, ^setpos_abs_centre, false); if_setonscrollwheel("worldmap_zoom_scroll(event_mousey, $component18, $component19)", $component4); -_2309(1, $component4); +if_setpinch(true, $component4); ~worldmap_overview_toggle(false, $component6, $component8); cc_deleteall($component0); def_int $int25 = 0; diff --git a/scripts/[clientscript,worldmap_search_start].cs2 b/scripts/[clientscript,worldmap_search_start].cs2 index 68d291073..2b3b4a19e 100644 --- a/scripts/[clientscript,worldmap_search_start].cs2 +++ b/scripts/[clientscript,worldmap_search_start].cs2 @@ -10,5 +10,5 @@ if (cc_find($component0, $comsubid1) = ^true & .cc_find($component0, $comsubid2) %varcstring363 = ""; ~worldmap_search_update("", $component0); ~keyboard_show(0, 25); - _3140; + setkeyinputmode_activecomponent; } diff --git a/scripts/[proc,add_overlaytimer_coord].cs2 b/scripts/[proc,add_overlaytimer_coord].cs2 index 5c607baa2..ee32cbaa4 100644 --- a/scripts/[proc,add_overlaytimer_coord].cs2 +++ b/scripts/[proc,add_overlaytimer_coord].cs2 @@ -3,5 +3,5 @@ if (~on_enhanced_any = 0 | ~script5479($coord0, $int1, $int3) = 0) { return; } -def_entityoverlay $entityoverlay6 = _7204($coord0, 1, 0, 25, 25, 0); +def_entityoverlay $entityoverlay6 = entityoverlay_create_coord($coord0, 1, 0, 25, 25, 0); ~add_overlaytimer_inner($int1, $entityoverlay6, $clock2, $int3, $colour4, $int5); diff --git a/scripts/[proc,add_overlaytimer_inner].cs2 b/scripts/[proc,add_overlaytimer_inner].cs2 index 0d1317c21..9b0ec2929 100644 --- a/scripts/[proc,add_overlaytimer_inner].cs2 +++ b/scripts/[proc,add_overlaytimer_inner].cs2 @@ -7,9 +7,9 @@ switch_int ($int5) { case 1 : $int8 = calc(65536 - $int8); } -if (_202($entityoverlay1) = ^true) { +if (if_find_entityoverlay($entityoverlay1) = ^true) { cc_setontimer("overlaytimer_update($entityoverlay1, $clock2, $int3, $int5)"); - _103($entityoverlay1, ^iftype_arc, 0); + cc_create_entityoverlay($entityoverlay1, ^iftype_arc, 0); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setcolour($colour4); @@ -17,7 +17,7 @@ if (_202($entityoverlay1) = ^true) { cc_settrans(200); cc_setlinewid(1); cc_setarc(0, 65536); - _103($entityoverlay1, ^iftype_arc, 1); + cc_create_entityoverlay($entityoverlay1, ^iftype_arc, 1); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setcolour($colour4); @@ -25,7 +25,7 @@ if (_202($entityoverlay1) = ^true) { cc_settrans(128); cc_setlinewid(1); cc_setarc(0, $int8); - _103($entityoverlay1, ^iftype_arc, 2); + cc_create_entityoverlay($entityoverlay1, ^iftype_arc, 2); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setcolour($colour4); diff --git a/scripts/[proc,add_overlaytimer_loc].cs2 b/scripts/[proc,add_overlaytimer_loc].cs2 index 412d76e49..bb80b3865 100644 --- a/scripts/[proc,add_overlaytimer_loc].cs2 +++ b/scripts/[proc,add_overlaytimer_loc].cs2 @@ -7,5 +7,5 @@ def_int $int6 = 0; if (lc_param($loc0, param_1545) = true) { $int6 = 2; } -def_entityoverlay $entityoverlay7 = _7201(1, $int6, 25, 25, 0); +def_entityoverlay $entityoverlay7 = entityoverlay_create_loc(1, $int6, 25, 25, 0); ~add_overlaytimer_inner($int1, $entityoverlay7, $clock2, $int3, $colour4, $int5); diff --git a/scripts/[proc,add_overlaytimer_npc].cs2 b/scripts/[proc,add_overlaytimer_npc].cs2 index 9716d6899..1424b81d1 100644 --- a/scripts/[proc,add_overlaytimer_npc].cs2 +++ b/scripts/[proc,add_overlaytimer_npc].cs2 @@ -3,5 +3,5 @@ if (~on_enhanced_any = 0 | ~script5472($int0, $int2) = 0) { return; } -def_entityoverlay $entityoverlay5 = _7200(1, 0, 25, 25, 0); +def_entityoverlay $entityoverlay5 = entityoverlay_create_npc(1, 0, 25, 25, 0); ~add_overlaytimer_inner($int0, $entityoverlay5, $clock1, $int2, $colour3, $int4); diff --git a/scripts/[proc,blast_furnace_highlights].cs2 b/scripts/[proc,blast_furnace_highlights].cs2 index afe24e4d2..73be84116 100644 --- a/scripts/[proc,blast_furnace_highlights].cs2 +++ b/scripts/[proc,blast_furnace_highlights].cs2 @@ -1,8 +1,8 @@ // 6667 [proc,blast_furnace_highlights] if (%varbit14181 = 0) { - _7015(14, ^red, 1, 30, 5); - _7015(15, ^green, 1, 30, 5); + highlight_loctype_setup(14, ^red, 1, 30, 5); + highlight_loctype_setup(15, ^green, 1, 30, 5); highlight_loctype_on(pipes_9117, 14); highlight_loctype_on(pipes_9121, 14); highlight_loctype_on(drive_belt_9103, 14); @@ -18,6 +18,6 @@ if (%varbit14181 = 0) { highlight_loctype_off(bar_dispenser_multi_9092, 15); } } else { - _7015(14, ^red, 1, 30, 0); - _7015(15, ^green, 1, 30, 0); + highlight_loctype_setup(14, ^red, 1, 30, 0); + highlight_loctype_setup(15, ^green, 1, 30, 0); } diff --git a/scripts/[proc,br_fogcolour].cs2 b/scripts/[proc,br_fogcolour].cs2 index 923e924d3..26432e159 100644 --- a/scripts/[proc,br_fogcolour].cs2 +++ b/scripts/[proc,br_fogcolour].cs2 @@ -31,7 +31,7 @@ if (%varbit5320 <= 0 & %varbit5316 <= 0) { if ($int2 ! 255) { if_settrans(255, interface_328:1); } - _2124(255, interface_328:1); + if_setgradienttrans(255, interface_328:1); return; } def_int $int3 = 0; @@ -91,4 +91,4 @@ if ($int2 < $int16) { $int2 = calc($int2 - 1); } if_settrans($int2, interface_328:1); -_2124(255, interface_328:1); +if_setgradienttrans(255, interface_328:1); diff --git a/scripts/[proc,cannon_overlay].cs2 b/scripts/[proc,cannon_overlay].cs2 index 53b427483..6569c8546 100644 --- a/scripts/[proc,cannon_overlay].cs2 +++ b/scripts/[proc,cannon_overlay].cs2 @@ -6,8 +6,8 @@ if (~on_enhanced_any = 0) { if (%var3551 ! $coord0) { return; } -def_entityoverlay $entityoverlay1 = _7204(~centre_inner(3, $coord0), 6, 1, calc(36 * 2 + 6), calc(32 + 10), 0); -if (_202($entityoverlay1) = ^true) { +def_entityoverlay $entityoverlay1 = entityoverlay_create_coord(~centre_inner(3, $coord0), 6, 1, calc(36 * 2 + 6), calc(32 + 10), 0); +if (if_find_entityoverlay($entityoverlay1) = ^true) { cc_setonvartransmit("cannon_overlay_transmit($entityoverlay1, %varbit14174, %varbit13672, %var3551, $coord0){var3417, var2903, var3551}"); } ~cannon_overlay_create($entityoverlay1, $coord0); diff --git a/scripts/[proc,cannon_overlay_create].cs2 b/scripts/[proc,cannon_overlay_create].cs2 index 269fe0fa2..f10b8ef37 100644 --- a/scripts/[proc,cannon_overlay_create].cs2 +++ b/scripts/[proc,cannon_overlay_create].cs2 @@ -1,14 +1,14 @@ // 6676 [proc,cannon_overlay_create](entityoverlay $entityoverlay0, coord $coord1) -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); if (%var3551 ! $coord1) { - _7214($coord1, 6); + entityoverlay_delete_coord($coord1, 6); return; } if (%varbit14174 = 1 | %varbit13672 = 1) { return; } -_103($entityoverlay0, ^iftype_text, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_text, 0); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); if (%var3 <= 5) { diff --git a/scripts/[proc,cluehelper_highlight_channel_setup].cs2 b/scripts/[proc,cluehelper_highlight_channel_setup].cs2 index d16251620..c78eb3175 100644 --- a/scripts/[proc,cluehelper_highlight_channel_setup].cs2 +++ b/scripts/[proc,cluehelper_highlight_channel_setup].cs2 @@ -1,12 +1,12 @@ // 6492 [proc,cluehelper_highlight_channel_setup](int $int0) if ($int0 = 0 | %varbit14182 = 0) { - _7035(9, null, 1, 0, 0); - _7000(9, null, 1, 0, 0); - _7005(9, null, 1, 0, 0); - _7010(9, null, 1, 0, 0); + highlight_tile_setup(9, null, 1, 0, 0); + highlight_npc_setup(9, null, 1, 0, 0); + highlight_npctype_setup(9, null, 1, 0, 0); + highlight_loc_setup(9, null, 1, 0, 0); } else { - _7035(9, ^green, 2, 30, 26); - _7000(9, ^green, 2, 30, 1); - _7005(9, ^green, 2, 30, 1); + highlight_tile_setup(9, ^green, 2, 30, 26); + highlight_npc_setup(9, ^green, 2, 30, 1); + highlight_npctype_setup(9, ^green, 2, 30, 1); } diff --git a/scripts/[proc,cluehelper_key_npc].cs2 b/scripts/[proc,cluehelper_key_npc].cs2 index 350c3c0fd..d15be0e91 100644 --- a/scripts/[proc,cluehelper_key_npc].cs2 +++ b/scripts/[proc,cluehelper_key_npc].cs2 @@ -11,7 +11,7 @@ def_int $int6 = 0; if (inv_total(inv, $obj5) > 0) { $int6 = 1; } -if (_202($entityoverlay2) = ^true) { +if (if_find_entityoverlay($entityoverlay2) = ^true) { cc_setonvartransmit("cluehelper_key_npc_vartransmit($dbrow0, $dbrow1, $entityoverlay2, $int4, $npc_uid3, %varbit14189, %varbit14184, $obj5, $int6){var3546, var3543}"); cc_setoninvtransmit("cluehelper_key_npc_invtransmit($dbrow0, $dbrow1, $entityoverlay2, $int4, $npc_uid3, $obj5, $int6){inv}"); } diff --git a/scripts/[proc,cluehelper_key_npc_draw].cs2 b/scripts/[proc,cluehelper_key_npc_draw].cs2 index 92c2c35b8..f1bc58a3d 100644 --- a/scripts/[proc,cluehelper_key_npc_draw].cs2 +++ b/scripts/[proc,cluehelper_key_npc_draw].cs2 @@ -1,6 +1,6 @@ // 6622 [proc,cluehelper_key_npc_draw](dbrow $dbrow0, dbrow $dbrow1, entityoverlay $entityoverlay2, int $int3, npc_uid $npc_uid4, obj $obj5, int $int6) -_104($entityoverlay2); +cc_deleteall_entityoverlay($entityoverlay2); highlight_npc_off($npc_uid4, $int3, 9); if (%var3546 ! $dbrow0) { return; @@ -13,12 +13,12 @@ if (%varbit14189 = 0) { return; } def_obj $obj7 = enum(int, obj, enum_4616, ~cluehelper_clue_difficulty($dbrow0)); -_103($entityoverlay2, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay2, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(4, 4, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum($obj7, 1); cc_setoutline(1); -_103($entityoverlay2, ^iftype_graphic, 1); +cc_create_entityoverlay($entityoverlay2, ^iftype_graphic, 1); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(-4, -4, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum($obj5, 1); diff --git a/scripts/[proc,cluehelper_overlay].cs2 b/scripts/[proc,cluehelper_overlay].cs2 index 8d1bdfb94..0da16461b 100644 --- a/scripts/[proc,cluehelper_overlay].cs2 +++ b/scripts/[proc,cluehelper_overlay].cs2 @@ -15,20 +15,20 @@ $loc2, $coord3 = ~script6652($dbrow0); def_int $int4 = -1; def_obj $obj5 = null; def_obj $obj6 = enum(int, obj, enum_4616, ~cluehelper_clue_difficulty($dbrow0)); -if ($loc2 ! null & $coord3 ! null & _6951($coord3) = true) { +if ($loc2 ! null & $coord3 ! null & tile_find($coord3) = true) { ~script6507($dbrow0, $dbrow1, $loc2, $coord3, $obj6); } else if (db_getrowtable($dbrow1) = dbtable_16) { if (%varbit14184 = 1) { - _7010(9, ^green, 2, 30, 1); + highlight_loc_setup(9, ^green, 2, 30, 1); } $loc2 = db_getfield($dbrow1, dbtable_16:0, 0); $coord3 = db_getfield($dbrow1, dbtable_16:2, 0); if ($loc2 ! null & $coord3 ! null) { - ~script6505($dbrow0, $loc2, $coord3, $obj6); + ~cluehelper_overlay_loc_draw($dbrow0, $loc2, $coord3, $obj6); } } else if (db_getrowtable($dbrow1) = dbtable_19) { if (%varbit14184 = 1) { - _7010(9, ^green, 2, 30, 1); + highlight_loc_setup(9, ^green, 2, 30, 1); } $loc2 = db_getfield($dbrow1, dbtable_19:0, 0); $coord3 = db_getfield($dbrow1, dbtable_19:1, 0); diff --git a/scripts/[proc,cluehelper_overlay_dig_draw].cs2 b/scripts/[proc,cluehelper_overlay_dig_draw].cs2 index 62e7d3ca1..c18166cc0 100644 --- a/scripts/[proc,cluehelper_overlay_dig_draw].cs2 +++ b/scripts/[proc,cluehelper_overlay_dig_draw].cs2 @@ -1,14 +1,14 @@ // 6503 [proc,cluehelper_overlay_dig_draw](dbrow $dbrow0, coord $coord1, obj $obj2) def_entityoverlay $entityoverlay3 = null; -if (_6951($coord1) = true) { - $entityoverlay3 = _7209($coord1, 7); +if (tile_find($coord1) = true) { + $entityoverlay3 = entityoverlay_get_coord($coord1, 7); if ($entityoverlay3 = null) { - $entityoverlay3 = _7204($coord1, 7, 1, 60, 60, 1); + $entityoverlay3 = entityoverlay_create_coord($coord1, 7, 1, 60, 60, 1); } else { - _104($entityoverlay3); + cc_deleteall_entityoverlay($entityoverlay3); } - if (_202($entityoverlay3) = ^true) { + if (if_find_entityoverlay($entityoverlay3) = ^true) { cc_setonvartransmit("cluehelper_overlay_dig_transmit($dbrow0, $coord1, $obj2, %varbit14189, %var3548, %var3549, %var3550, %var3547, %varbit14182, %varbit14184){var3546, var3543, var3548, var3549, var3550, var3547}"); } if (%varbit14182 = 0 | ~cluehelper_overlay_npc_active = 1) { @@ -16,12 +16,12 @@ if (_6951($coord1) = true) { return; } if (%varbit14189 = 1) { - _103($entityoverlay3, ^iftype_graphic, 0); + cc_create_entityoverlay($entityoverlay3, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum($obj2, 1); cc_setoutline(1); - _103($entityoverlay3, ^iftype_graphic, 1); + cc_create_entityoverlay($entityoverlay3, ^iftype_graphic, 1); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(spade_952, 1); diff --git a/scripts/[proc,cluehelper_overlay_loc_draw].cs2 b/scripts/[proc,cluehelper_overlay_loc_draw].cs2 new file mode 100644 index 000000000..bde8c370a --- /dev/null +++ b/scripts/[proc,cluehelper_overlay_loc_draw].cs2 @@ -0,0 +1,29 @@ +// 6505 +[proc,cluehelper_overlay_loc_draw](dbrow $dbrow0, loc $loc1, coord $coord2, obj $obj3) +def_entityoverlay $entityoverlay4 = null; +if (loc_find($coord2, $loc1) = true) { + $entityoverlay4 = entityoverlay_get_loc(5); + if ($entityoverlay4 = null) { + $entityoverlay4 = entityoverlay_create_loc(5, 1, 36, 32, 1); + } else { + cc_deleteall_entityoverlay($entityoverlay4); + } + if (if_find_entityoverlay($entityoverlay4) = ^true) { + cc_setonvartransmit("cluehelper_overlay_loc_transmit($entityoverlay4, $dbrow0, $loc1, $coord2, $obj3, %varbit14189, %var3548, %var3549, %var3550, %var3547, %varbit14184, %varbit14182){var3546, var3543, var3548, var3549, var3550, var3547}"); + } + if (%varbit14182 = 0 | ~cluehelper_overlay_npc_active = 1) { + highlight_loc_off($loc1, $coord2, 9, 1); + return; + } + if (%varbit14189 = 1) { + cc_create_entityoverlay($entityoverlay4, ^iftype_graphic, 0); + cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); + cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); + cc_setobject_nonum($obj3, 1); + cc_setoutline(1); + } + highlight_loc_setup(9, ^green, 2, 30, 1); + if (%varbit14184 = 1) { + highlight_loc_on($loc1, $coord2, 9, 1); + } +} diff --git a/scripts/[proc,cluehelper_uri_overlay].cs2 b/scripts/[proc,cluehelper_uri_overlay].cs2 index 94bc78d5f..80559df12 100644 --- a/scripts/[proc,cluehelper_uri_overlay].cs2 +++ b/scripts/[proc,cluehelper_uri_overlay].cs2 @@ -1,8 +1,8 @@ // 6527 [proc,cluehelper_uri_overlay](int $int0) highlight_npc_off(npc_uid, npc_spawncycle, 9); -def_entityoverlay $entityoverlay1 = _7200(3, 1, calc(36 * 2), calc(32 * 2), 1); -if (_202($entityoverlay1) = ^true) { +def_entityoverlay $entityoverlay1 = entityoverlay_create_npc(3, 1, calc(36 * 2), calc(32 * 2), 1); +if (if_find_entityoverlay($entityoverlay1) = ^true) { if ($int0 = 2 | $int0 = 3) { cc_setonvartransmit("script6530($entityoverlay1, npc_uid, npc_spawncycle, %varbit14189, %var3548, %var3547, %var3546, %var292, $int0){var3543, var3546, var3548, var3547, var292}"); } else if ($int0 = 4) { diff --git a/scripts/[proc,deadman_spectator_names].cs2 b/scripts/[proc,deadman_spectator_names].cs2 index 3dcdc9901..be99e6d2a 100644 --- a/scripts/[proc,deadman_spectator_names].cs2 +++ b/scripts/[proc,deadman_spectator_names].cs2 @@ -1,8 +1,8 @@ // 2179 [proc,deadman_spectator_names](int $int0) -_3124; +resetdrawplayernames; if ($int0 = 1) { - _3120(true); + setdrawplayernames_friends(true); } else if ($int0 = 2) { - _3122(true); + setdrawplayernames_others(true); } diff --git a/scripts/[proc,deadman_tournament_fogcolour].cs2 b/scripts/[proc,deadman_tournament_fogcolour].cs2 index c64b3f434..61457af8f 100644 --- a/scripts/[proc,deadman_tournament_fogcolour].cs2 +++ b/scripts/[proc,deadman_tournament_fogcolour].cs2 @@ -9,7 +9,7 @@ if (enum(int, boolean, enum_1904, %var1676) = false) { if ($int1 ! 255) { if_settrans(255, interface_90:1); } - _2124(255, interface_90:1); + if_setgradienttrans(255, interface_90:1); return; } def_int $int2 = 0; @@ -53,11 +53,11 @@ if ($int16 < $int4) { $int16 = calc($int16 - 1); } if_setcolour(~rgb_to_hex($int14, $int15, $int16), interface_90:1); -if_setfillcolour(~rgb_to_hex($int14, $int15, $int16), interface_90:1); +if_setgradientcolour(~rgb_to_hex($int14, $int15, $int16), interface_90:1); if ($int1 < $int13) { $int1 = calc($int1 + 1); } else if ($int1 > $int13) { $int1 = calc($int1 - 1); } if_settrans($int1, interface_90:1); -_2124(255, interface_90:1); +if_setgradienttrans(255, interface_90:1); diff --git a/scripts/[proc,entity_highlight_clear].cs2 b/scripts/[proc,entity_highlight_clear].cs2 index 6222805ef..cc8dfdf12 100644 --- a/scripts/[proc,entity_highlight_clear].cs2 +++ b/scripts/[proc,entity_highlight_clear].cs2 @@ -17,16 +17,16 @@ switch_int ($int0) { case default : return; } -if ($npc_uid1 ! null & $int2 ! -1 & _7003($npc_uid1, $int2, $int0) = true) { +if ($npc_uid1 ! null & $int2 ! -1 & highlight_npc_get($npc_uid1, $int2, $int0) = true) { highlight_npc_off($npc_uid1, $int2, $int0); } -if ($loc3 ! null & $coord4 ! null & _7013($loc3, $coord4, $int0, 0) = true) { +if ($loc3 ! null & $coord4 ! null & highlight_loc_get($loc3, $coord4, $int0, 0) = true) { highlight_loc_off($loc3, $coord4, $int0, 0); ~entity_highlight_active_loc_linked($loc3, $coord4, $int0, 0); } -if ($obj5 ! null & $coord6 ! null & _7023($obj5, $coord6, $int0, 0) = true) { +if ($obj5 ! null & $coord6 ! null & highlight_obj_get($obj5, $coord6, $int0, 0) = true) { highlight_obj_off($obj5, $coord6, $int0, 0); } -if (string_length($string0) > 0 & _7033($string0, $int0) = true) { +if (string_length($string0) > 0 & highlight_player_get($string0, $int0) = true) { highlight_player_off($string0, $int0); } diff --git a/scripts/[proc,entity_highlight_minimenu].cs2 b/scripts/[proc,entity_highlight_minimenu].cs2 index 9187fdead..724a44a6c 100644 --- a/scripts/[proc,entity_highlight_minimenu].cs2 +++ b/scripts/[proc,entity_highlight_minimenu].cs2 @@ -2,36 +2,36 @@ [proc,entity_highlight_minimenu](int $int0) def_int $int1 = ~max(_7460, 0); def_entityoverlay $entityoverlay2 = null; -switch_int (_7451($int1)) { - case 2 : - if (_7453($int1) = true) { +switch_int (minimenu_type($int1)) { + case ^minimenu_entry_type_npc : + if (minimenu_npc_find($int1) = true) { ~entity_highlight_active_npc($int0); if ($int0 = 4) { - $entityoverlay2 = _7203(0, 0, 1, 1, 0); + $entityoverlay2 = entityoverlay_create_player(0, 0, 1, 1, 0); ~script5961($entityoverlay2); } } - case 3 : - if (_7454($int1) = true) { + case ^minimenu_entry_type_loc : + if (minimenu_loc_find($int1) = true) { ~entity_highlight_active_loc($int0); if ($int0 = 4) { - $entityoverlay2 = _7203(0, 0, 1, 1, 0); + $entityoverlay2 = entityoverlay_create_player(0, 0, 1, 1, 0); ~script5961($entityoverlay2); } } - case 4 : - if (_7455($int1) = true) { + case ^minimenu_entry_type_obj : + if (minimenu_obj_find($int1) = true) { ~entity_highlight_active_obj($int0); if ($int0 = 4) { - $entityoverlay2 = _7203(0, 0, 1, 1, 0); + $entityoverlay2 = entityoverlay_create_player(0, 0, 1, 1, 0); ~script5961($entityoverlay2); } } - case 6 : - if (_7456($int1) = true) { + case ^minimenu_entry_type_player : + if (minimenu_player_find($int1) = true) { ~entity_highlight_active_player($int0); if ($int0 = 4) { - $entityoverlay2 = _7203(0, 0, 1, 1, 0); + $entityoverlay2 = entityoverlay_create_player(0, 0, 1, 1, 0); ~script5961($entityoverlay2); } } diff --git a/scripts/[proc,entity_highlight_setup].cs2 b/scripts/[proc,entity_highlight_setup].cs2 index a3dfddcf4..c754a0b56 100644 --- a/scripts/[proc,entity_highlight_setup].cs2 +++ b/scripts/[proc,entity_highlight_setup].cs2 @@ -10,14 +10,14 @@ switch_int ($int0) { return; } if ($boolean3 = true) { - _7000($int0, 0xc0c000, $int1, $int2, $int7); + highlight_npc_setup($int0, 0xc0c000, $int1, $int2, $int7); } if ($boolean4 = true) { - _7010($int0, 0x00c0c0, $int1, $int2, $int7); + highlight_loc_setup($int0, 0x00c0c0, $int1, $int2, $int7); } if ($boolean5 = true) { - _7020($int0, 0xc06030, $int1, $int2, $int7); + highlight_obj_setup($int0, 0xc06030, $int1, $int2, $int7); } if ($boolean6 = true) { - _7030($int0, 0xc0c0c0, $int1, $int2, $int7); + highlight_player_setup($int0, 0xc0c0c0, $int1, $int2, $int7); } diff --git a/scripts/[proc,fade_component].cs2 b/scripts/[proc,fade_component].cs2 new file mode 100644 index 000000000..0c40f03eb --- /dev/null +++ b/scripts/[proc,fade_component].cs2 @@ -0,0 +1,19 @@ +// 7060 +[proc,fade_component](int $int0, int $int1, int $int2, component $component3) +if ($int0 < 0) { + $int0 = 0; +} else if ($int0 > 255) { + $int0 = 255; +} +if ($int1 < 0) { + $int1 = 0; +} else if ($int1 > 255) { + $int1 = 255; +} +if ($int2 <= 0) { + if_settrans($int1, $component3); + if_setontimer(null, $component3); + return; +} +~fade_component_increment($int0, $int1, $int2, $int2, $component3); +if_setontimer("fade_component_update($int0, $int1, $int2, calc(clientclock + $int2), $component3)", $component3); diff --git a/scripts/[proc,script7062].cs2 b/scripts/[proc,fade_component_increment].cs2 similarity index 66% rename from scripts/[proc,script7062].cs2 rename to scripts/[proc,fade_component_increment].cs2 index 7b2a13da1..9190675a4 100644 --- a/scripts/[proc,script7062].cs2 +++ b/scripts/[proc,fade_component_increment].cs2 @@ -1,5 +1,5 @@ // 7062 -[proc,script7062](int $int0, int $int1, int $int2, int $int3, component $component4) +[proc,fade_component_increment](int $int0, int $int1, int $int2, int $int3, component $component4) if ($int3 <= 0) { if_settrans($int1, $component4); if_setontimer(null, $component4); diff --git a/scripts/[proc,script7058].cs2 b/scripts/[proc,fade_overlay].cs2 similarity index 83% rename from scripts/[proc,script7058].cs2 rename to scripts/[proc,fade_overlay].cs2 index 3c336f82d..25ef02d27 100644 --- a/scripts/[proc,script7058].cs2 +++ b/scripts/[proc,fade_overlay].cs2 @@ -1,5 +1,5 @@ // 7058 -[proc,script7058](int $int0, int $int1, int $int2, int $int3, int $int4, component $component5) +[proc,fade_overlay](int $int0, int $int1, int $int2, int $int3, int $int4, component $component5) if ($int1 < 0) { $int1 = 0; } else if ($int1 > 255) { diff --git a/scripts/[proc,fishing_spot_indicator_create].cs2 b/scripts/[proc,fishing_spot_indicator_create].cs2 index 2d1de9231..85be18e45 100644 --- a/scripts/[proc,fishing_spot_indicator_create].cs2 +++ b/scripts/[proc,fishing_spot_indicator_create].cs2 @@ -1,7 +1,7 @@ // 4553 [proc,fishing_spot_indicator_create](entityoverlay $entityoverlay0, struct $struct1, npc_uid $npc_uid2, int $int3, loc $loc4, coord $coord5) -_104($entityoverlay0); -if (_202($entityoverlay0) = ^true) { +cc_deleteall_entityoverlay($entityoverlay0); +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonmouseleave(null); cc_setonmouseover(null); } @@ -93,7 +93,7 @@ if ($namedobj14 = null) { } return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(0, 0, ^setpos_abs_left, ^setpos_abs_top); cc_setobject_nonum($namedobj14, 1); @@ -105,7 +105,7 @@ if ($npc_uid2 ! null & $int3 ! -1) { if ($loc4 ! null & $coord5 ! null) { highlight_loc_on($loc4, $coord5, 15, 1); } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); if (%varbit12351 = 0 & ~on_mobile = false) { cc_setonmouseleave("fishing_spot_indicator_mouseleave($entityoverlay0, $struct1, $npc_uid2, $int3, $loc4, $coord5)"); diff --git a/scripts/[proc,fishing_spot_indicator_tile_setup].cs2 b/scripts/[proc,fishing_spot_indicator_tile_setup].cs2 index 6fb1ec6fd..0ad8244a3 100644 --- a/scripts/[proc,fishing_spot_indicator_tile_setup].cs2 +++ b/scripts/[proc,fishing_spot_indicator_tile_setup].cs2 @@ -1,9 +1,9 @@ // 4560 [proc,fishing_spot_indicator_tile_setup] if (%varbit12349 = 1) { - _7000(11, null, 0, 0, 0); - _7010(15, null, 0, 0, 0); + highlight_npc_setup(11, null, 0, 0, 0); + highlight_loc_setup(15, null, 0, 0, 0); } else { - _7000(11, ^cyan, 2, 50, 10); - _7010(15, ^cyan, 2, 50, 10); + highlight_npc_setup(11, ^cyan, 2, 50, 10); + highlight_loc_setup(15, ^cyan, 2, 50, 10); } diff --git a/scripts/[proc,script7206].cs2 b/scripts/[proc,ground_items_build].cs2 similarity index 89% rename from scripts/[proc,script7206].cs2 rename to scripts/[proc,ground_items_build].cs2 index 2a4bf7799..513f24b5f 100644 --- a/scripts/[proc,script7206].cs2 +++ b/scripts/[proc,ground_items_build].cs2 @@ -1,5 +1,5 @@ // 7206 -[proc,script7206] +[proc,ground_items_build] ~script7213(interface_650:49, stringvector_4); ~script7213(interface_650:52, stringvector_3); def_boolean $boolean0 = ~on_mobile; @@ -32,8 +32,8 @@ if (%varbit14869 = 1) { } else { .cc_setgraphic("toggle_box,0"); } -cc_setonop("script7207(event_com, .cc_getid)"); -cc_setonvartransmit("script7208(event_com, .cc_getid){var3539}"); +cc_setonop("ground_items_toggle_op(event_com, .cc_getid)"); +cc_setonvartransmit("ground_items_toggle_transmit(event_com, .cc_getid){var3539}"); $int3 = calc($int3 + 1); $int2 = calc($int2 + $int1); if_setsize(0, $int2, ^setsize_minus, ^setsize_abs, interface_650:45); diff --git a/scripts/[proc,ground_items_clear_vector].cs2 b/scripts/[proc,ground_items_clear_vector].cs2 new file mode 100644 index 000000000..95fc152f8 --- /dev/null +++ b/scripts/[proc,ground_items_clear_vector].cs2 @@ -0,0 +1,7 @@ +// 7220 +[proc,ground_items_clear_vector](stringvector $stringvector0, int $int1) +stringvector_clear($stringvector0); +%varcint1154 = calc(clientclock + 1); +if ($int1 = 1) { + ~ground_items_build; +} diff --git a/scripts/[proc,ground_items_custom_highlight].cs2 b/scripts/[proc,ground_items_custom_highlight].cs2 new file mode 100644 index 000000000..86942f225 --- /dev/null +++ b/scripts/[proc,ground_items_custom_highlight].cs2 @@ -0,0 +1,7 @@ +// 7238 +[proc,ground_items_custom_highlight](obj $obj0)(int) +def_string $string0 = removetags(oc_name($obj0)); +if (stringvector_contains(stringvector_4, $string0, true, false) = 1) { + return(1); +} +return(0); diff --git a/scripts/[proc,ground_items_display].cs2 b/scripts/[proc,ground_items_display].cs2 new file mode 100644 index 000000000..26bd78947 --- /dev/null +++ b/scripts/[proc,ground_items_display].cs2 @@ -0,0 +1,7 @@ +// 7239 +[proc,ground_items_display](obj $obj0)(boolean) +def_string $string0 = removetags(oc_name($obj0)); +if (stringvector_contains(stringvector_3, $string0, true, false) = 1) { + return(false); +} +return(true); diff --git a/scripts/[proc,script7236].cs2 b/scripts/[proc,ground_items_price].cs2 similarity index 89% rename from scripts/[proc,script7236].cs2 rename to scripts/[proc,ground_items_price].cs2 index 6ed9a505a..18a61a351 100644 --- a/scripts/[proc,script7236].cs2 +++ b/scripts/[proc,ground_items_price].cs2 @@ -1,5 +1,5 @@ // 7236 -[proc,script7236](obj $obj0)(int, int) +[proc,ground_items_price](obj $obj0)(int, int) if ($obj0 = coins_995) { return(1, 1); } diff --git a/scripts/[proc,script7227].cs2 b/scripts/[proc,ground_items_setup].cs2 similarity index 74% rename from scripts/[proc,script7227].cs2 rename to scripts/[proc,ground_items_setup].cs2 index 89af699d9..be9713f5c 100644 --- a/scripts/[proc,script7227].cs2 +++ b/scripts/[proc,ground_items_setup].cs2 @@ -1,20 +1,20 @@ // 7227 -[proc,script7227](coord $coord0) +[proc,ground_items_setup](coord $coord0) def_int $int1 = ~script7241; def_boolean $boolean2 = ~script7242; def_boolean $boolean3 = ~script7243; -def_int $int4 = _7120($coord0); +def_int $int4 = objstack_size($coord0); def_int $int5 = 5; def_int $int6 = $int5; -def_entityoverlay $entityoverlay7 = _7209($coord0, 0); +def_entityoverlay $entityoverlay7 = entityoverlay_get_coord($coord0, 0); if ($entityoverlay7 = null) { if ($int4 <= 0) { return; } - $entityoverlay7 = _7204($coord0, 0, 1, calc(350 + 108), calc($int5 * 17), 1); + $entityoverlay7 = entityoverlay_create_coord($coord0, 0, 1, calc(350 + 108), calc($int5 * 17), 1); } if ($int4 <= 0) { - _7214($coord0, 0); + entityoverlay_delete_coord($coord0, 0); return; } def_obj $objarray0($int4); @@ -38,10 +38,10 @@ if (%varbit14869 = 1) { while ($int10 > 0) { $int10 = calc($int10 - 1); $obj11 = $obj12; - $obj12 = _7121($coord0, $int10); - $boolean8 = ~script7239($obj12); - $int9 = _7122($coord0, $int10); - $int13, $int18 = ~script7236($obj12); + $obj12 = objstack_obj($coord0, $int10); + $boolean8 = ~ground_items_display($obj12); + $int9 = objstack_count($coord0, $int10); + $int13, $int18 = ~ground_items_price($obj12); if (oc_stackable($obj12) = true) { $int14 = ~min(^max_32bit_int, calc($int13 * $int9)); } else { @@ -50,7 +50,7 @@ if (%varbit14869 = 1) { if ($int18 = 0) { $int19 = 1; } - if (_6859($coord0, $int10) = true & ~script7240($obj12) = 1 & (~script7228($int14) = 1 & $boolean8 = true | ($int1 = 1 | ~script7238($obj12) = 1))) { + if (obj_findbyindex($coord0, $int10) = true & ~script7240($obj12) = 1 & (~script7228($int14) = 1 & $boolean8 = true | ($int1 = 1 | ~ground_items_custom_highlight($obj12) = 1))) { if ($obj12 = $obj11) { $int17 = calc($int17 - 1); $intarray1($int17) = calc($intarray1($int17) + $int9); @@ -73,7 +73,7 @@ if (%varbit14869 = 1) { } def_int $int20 = 0; def_int $int21 = 0; -_104($entityoverlay7); +cc_deleteall_entityoverlay($entityoverlay7); def_int $int22 = 0; if ($int1 = 1) { $int6 = $int17; @@ -85,7 +85,7 @@ if ($int1 = 1) { } else { $int5 = $int17; } -if (_202($entityoverlay7) = ^true) { +if (if_find_entityoverlay($entityoverlay7) = ^true) { cc_setsize(calc(350 + 108), calc($int5 * 17), ^setsize_abs, ^setsize_abs); } def_int $int23 = 6; @@ -112,7 +112,7 @@ if (%varbit14869 = 1) { } while ($int10 < $int17 & $int20 < $int6) { $obj12 = $objarray0($int10); - if ($obj12 ! null & ($int25 ! -1 & $intarray4($int10) >= $int25 | ~script7238($obj12) = 1)) { + if ($obj12 ! null & ($int25 ! -1 & $intarray4($int10) >= $int25 | ~ground_items_custom_highlight($obj12) = 1)) { if ($int1 = 1 & $booleanarray3($int10) = false & $int23 ! 6) { $int21 = ~script7232($entityoverlay7, $coord0, $int20, $int21, $int5, $obj12, $intarray1($int10), $intarray4($int10), 0xa0a0a0, $intarray2($int10), $int1, $boolean2, $boolean3); } else { @@ -126,7 +126,7 @@ if (%varbit14869 = 1) { $int23 = calc($int23 - 1); } if ($int22 ! 0) { - _103($entityoverlay7, ^iftype_text, $int21); + cc_create_entityoverlay($entityoverlay7, ^iftype_text, $int21); cc_setsize(108, 17, ^setsize_minus, ^setsize_abs); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_bottom); cc_settextfont(p12_full); @@ -136,13 +136,13 @@ if (%varbit14869 = 1) { cc_settext("and more"); } } -if (_202($entityoverlay7) = ^true) { +if (if_find_entityoverlay($entityoverlay7) = ^true) { if ($int19 = 1) { cc_setontimer("script7231($entityoverlay7, $coord0, clientclock, 1)"); } else { cc_setontimer("script7231($entityoverlay7, $coord0, -1, -1)"); } - cc_setonkeydown("script7230(event_key, $coord0)"); - cc_setonkeyup("script7230(event_key, $coord0)"); - cc_setonvartransmit("script7229($coord0){var3539, var3795, var3800, var3801, var3802, var3803, var3804, var3805, var3806, var3807, var3808, var3809, var3810}"); + cc_setonkeydown("ground_items_key(event_key, $coord0)"); + cc_setonkeyup("ground_items_key(event_key, $coord0)"); + cc_setonvartransmit("ground_items_transmit($coord0){var3539, var3795, var3800, var3801, var3802, var3803, var3804, var3805, var3806, var3807, var3808, var3809, var3810}"); } diff --git a/scripts/[proc,script7209].cs2 b/scripts/[proc,ground_items_toggle_synch].cs2 similarity index 69% rename from scripts/[proc,script7209].cs2 rename to scripts/[proc,ground_items_toggle_synch].cs2 index c3c788ecf..7c6b05db8 100644 --- a/scripts/[proc,script7209].cs2 +++ b/scripts/[proc,ground_items_toggle_synch].cs2 @@ -1,5 +1,5 @@ // 7209 -[proc,script7209](component $component0, int $comsubid1) +[proc,ground_items_toggle_synch](component $component0, int $comsubid1) if (cc_find($component0, $comsubid1) = ^true) { if (%varbit14869 = 1) { cc_setgraphic("toggle_box,1"); diff --git a/scripts/[proc,helper_agility_highlight_course].cs2 b/scripts/[proc,helper_agility_highlight_course].cs2 index e78fbb44e..3587eb28e 100644 --- a/scripts/[proc,helper_agility_highlight_course].cs2 +++ b/scripts/[proc,helper_agility_highlight_course].cs2 @@ -13,9 +13,9 @@ def_int $int7 = -1; def_int $int8 = -1; def_loc $loc9 = null; def_npc $npc10 = null; -_7019(11); -_7009(11); -_7039(10); +highlight_loctype_clear(11); +highlight_npctype_clear(11); +highlight_tile_clear(10); ~helper_agility_highlight_starts; if ($int0 = -1) { return; diff --git a/scripts/[proc,helper_agility_highlight_obstacles].cs2 b/scripts/[proc,helper_agility_highlight_obstacles].cs2 index 805bfdad2..214352995 100644 --- a/scripts/[proc,helper_agility_highlight_obstacles].cs2 +++ b/scripts/[proc,helper_agility_highlight_obstacles].cs2 @@ -1,17 +1,17 @@ // 1854 [proc,helper_agility_highlight_obstacles] if (%varbit12380 = 1) { - _7010(11, ^green, 1, 30, 5); - _7015(11, ^green, 1, 30, 5); - _7005(11, ^green, 1, 30, 5); - _7035(10, ^green, 1, 30, 10); - _7025(9, ^red, 1, 30, 15); + highlight_loc_setup(11, ^green, 1, 30, 5); + highlight_loctype_setup(11, ^green, 1, 30, 5); + highlight_npctype_setup(11, ^green, 1, 30, 5); + highlight_tile_setup(10, ^green, 1, 30, 10); + highlight_objtype_setup(9, ^red, 1, 30, 15); highlight_objtype_on(mark_of_grace_11849, 9); highlight_objtype_on(stick_4179, 9); } else { - _7010(11, ^green, 1, 0, 0); - _7015(11, ^green, 1, 0, 0); - _7005(11, ^green, 1, 0, 0); - _7035(10, ^green, 1, 0, 0); - _7025(9, ^red, 1, 0, 0); + highlight_loc_setup(11, ^green, 1, 0, 0); + highlight_loctype_setup(11, ^green, 1, 0, 0); + highlight_npctype_setup(11, ^green, 1, 0, 0); + highlight_tile_setup(10, ^green, 1, 0, 0); + highlight_objtype_setup(9, ^red, 1, 0, 0); } diff --git a/scripts/[proc,helper_agility_highlight_setup].cs2 b/scripts/[proc,helper_agility_highlight_setup].cs2 index b055a90ff..4e0299076 100644 --- a/scripts/[proc,helper_agility_highlight_setup].cs2 +++ b/scripts/[proc,helper_agility_highlight_setup].cs2 @@ -1,9 +1,9 @@ // 5325 [proc,helper_agility_highlight_setup] if (%varbit13135 > 0) { - _7010(12, ^green, 1, 30, 5); - _7010(13, ^red, 1, 30, 5); + highlight_loc_setup(12, ^green, 1, 30, 5); + highlight_loc_setup(13, ^red, 1, 30, 5); } else { - _7010(12, ^green, 2, 0, 0); - _7010(13, ^red, 2, 0, 0); + highlight_loc_setup(12, ^green, 2, 0, 0); + highlight_loc_setup(13, ^red, 2, 0, 0); } diff --git a/scripts/[proc,helper_generic_setup].cs2 b/scripts/[proc,helper_generic_setup].cs2 index 382915e28..f31651a3d 100644 --- a/scripts/[proc,helper_generic_setup].cs2 +++ b/scripts/[proc,helper_generic_setup].cs2 @@ -21,5 +21,5 @@ if ($int2 = 1) { } if_setonvartransmit(null, interface_711:5); if (~on_enhanced_any = 1) { - _2433(null, interface_711:5); + if_setonmappost(null, interface_711:5); } diff --git a/scripts/[proc,herbiboar_helper_highlight_clear].cs2 b/scripts/[proc,herbiboar_helper_highlight_clear].cs2 index adf3bb579..248e831dc 100644 --- a/scripts/[proc,herbiboar_helper_highlight_clear].cs2 +++ b/scripts/[proc,herbiboar_helper_highlight_clear].cs2 @@ -1,7 +1,7 @@ // 6442 [proc,herbiboar_helper_highlight_clear] -_7014(10); -_7014(14); -_7019(10); -_7019(13); -_7009(12); +highlight_loc_clear(10); +highlight_loc_clear(14); +highlight_loctype_clear(10); +highlight_loctype_clear(13); +highlight_npctype_clear(12); diff --git a/scripts/[proc,herbiboar_helper_highlight_disable].cs2 b/scripts/[proc,herbiboar_helper_highlight_disable].cs2 index 0fb3680f1..3be7ab8e6 100644 --- a/scripts/[proc,herbiboar_helper_highlight_disable].cs2 +++ b/scripts/[proc,herbiboar_helper_highlight_disable].cs2 @@ -1,7 +1,7 @@ // 6440 [proc,herbiboar_helper_highlight_disable] -_7010(10, null, 1, 0, 0); -_7010(14, null, 1, 0, 0); -_7015(10, null, 1, 0, 0); -_7015(13, null, 1, 0, 0); -_7005(12, null, 1, 0, 0); +highlight_loc_setup(10, null, 1, 0, 0); +highlight_loc_setup(14, null, 1, 0, 0); +highlight_loctype_setup(10, null, 1, 0, 0); +highlight_loctype_setup(13, null, 1, 0, 0); +highlight_npctype_setup(12, null, 1, 0, 0); diff --git a/scripts/[proc,herbiboar_helper_highlight_enable].cs2 b/scripts/[proc,herbiboar_helper_highlight_enable].cs2 index 0097411d6..9da5065de 100644 --- a/scripts/[proc,herbiboar_helper_highlight_enable].cs2 +++ b/scripts/[proc,herbiboar_helper_highlight_enable].cs2 @@ -3,21 +3,21 @@ if ($int0 = 1) { ~herbiboar_helper_highlight_disable; } else if (stat(herblore) < 31 | stat(hunter) < 80) { - _7010(10, ^red, 1, 30, 1); - _7010(14, ^red, 1, 30, 26); - _7015(10, ^red, 1, 30, 1); - _7015(13, ^red, 1, 30, 26); - _7005(12, ^red, 1, 30, 1); + highlight_loc_setup(10, ^red, 1, 30, 1); + highlight_loc_setup(14, ^red, 1, 30, 26); + highlight_loctype_setup(10, ^red, 1, 30, 1); + highlight_loctype_setup(13, ^red, 1, 30, 26); + highlight_npctype_setup(12, ^red, 1, 30, 1); } else { if (%varbit5943 > 0) { - _7010(10, ^yellow, 1, 30, 1); - _7015(10, ^yellow, 1, 30, 1); - _7005(12, ^green, 1, 30, 1); + highlight_loc_setup(10, ^yellow, 1, 30, 1); + highlight_loctype_setup(10, ^yellow, 1, 30, 1); + highlight_npctype_setup(12, ^green, 1, 30, 1); return; } - _7010(10, ^green, 1, 30, 1); - _7010(14, ^white, 1, 30, 26); - _7015(10, ^green, 1, 30, 1); - _7015(13, ^white, 1, 30, 26); - _7005(12, ^green, 1, 30, 1); + highlight_loc_setup(10, ^green, 1, 30, 1); + highlight_loc_setup(14, ^white, 1, 30, 26); + highlight_loctype_setup(10, ^green, 1, 30, 1); + highlight_loctype_setup(13, ^white, 1, 30, 26); + highlight_npctype_setup(12, ^green, 1, 30, 1); } diff --git a/scripts/[proc,highlighting_off].cs2 b/scripts/[proc,highlighting_off].cs2 index ae6522fce..0978d24ae 100644 --- a/scripts/[proc,highlighting_off].cs2 +++ b/scripts/[proc,highlighting_off].cs2 @@ -3,139 +3,139 @@ if (~on_enhanced_any = 0) { return; } -_7035(0, null, 0, 0, 0); -_7035(1, null, 0, 0, 0); -_7035(2, null, 0, 0, 0); -_7035(3, null, 0, 0, 0); -_7035(4, null, 0, 0, 0); -_7035(5, null, 0, 0, 0); -_7035(6, null, 0, 0, 64); -_7035(7, null, 0, 0, 0); -_7035(8, null, 0, 0, 0); -_7035(9, null, 0, 0, 0); -_7035(10, null, 0, 0, 0); -_7030(0, null, 0, 0, 0); -_7030(1, null, 0, 0, 0); -_7030(2, null, 0, 0, 0); -_7030(3, null, 0, 0, 0); -_7030(4, null, 0, 0, 0); -_7030(5, null, 0, 0, 0); -_7030(6, null, 0, 0, 64); -_7030(7, null, 0, 0, 0); -_7030(8, null, 0, 0, 0); -_7030(9, null, 0, 0, 0); -_7030(10, null, 0, 0, 0); -_7000(0, null, 0, 0, 0); -_7000(1, null, 0, 0, 0); -_7000(2, null, 0, 0, 0); -_7000(3, null, 0, 0, 0); -_7000(4, null, 0, 0, 0); -_7000(5, null, 0, 0, 0); -_7000(6, null, 0, 0, 64); -_7000(7, null, 0, 0, 0); -_7000(8, null, 0, 0, 0); -_7000(9, null, 0, 0, 0); -_7000(10, null, 0, 0, 0); -_7000(11, null, 0, 0, 0); -_7005(0, null, 0, 0, 0); -_7005(1, null, 0, 0, 0); -_7005(2, null, 0, 0, 0); -_7005(3, null, 0, 0, 0); -_7005(4, null, 0, 0, 0); -_7005(5, null, 0, 0, 0); -_7005(6, null, 0, 0, 64); -_7005(7, null, 0, 0, 0); -_7005(8, null, 0, 0, 0); -_7005(9, null, 0, 0, 0); -_7005(10, null, 0, 0, 0); -_7005(11, null, 0, 0, 0); -_7005(12, null, 0, 0, 0); -_7020(0, null, 0, 0, 0); -_7020(1, null, 0, 0, 0); -_7020(2, null, 0, 0, 0); -_7020(3, null, 0, 0, 0); -_7020(4, null, 0, 0, 0); -_7020(5, null, 0, 0, 0); -_7020(6, null, 0, 0, 64); -_7020(7, null, 0, 0, 0); -_7020(8, null, 0, 0, 0); -_7020(9, null, 0, 0, 0); -_7020(10, null, 0, 0, 0); -_7020(11, null, 0, 0, 0); -_7020(12, null, 0, 0, 0); -_7025(0, null, 0, 0, 0); -_7025(1, null, 0, 0, 0); -_7025(2, null, 0, 0, 0); -_7025(3, null, 0, 0, 0); -_7025(4, null, 0, 0, 0); -_7025(5, null, 0, 0, 0); -_7025(6, null, 0, 0, 64); -_7025(7, null, 0, 0, 0); -_7025(8, null, 0, 0, 0); -_7025(9, null, 0, 0, 0); -_7010(0, null, 0, 0, 0); -_7010(1, null, 0, 0, 0); -_7010(2, null, 0, 0, 0); -_7010(3, null, 0, 0, 0); -_7010(4, null, 0, 0, 0); -_7010(5, null, 0, 0, 0); -_7010(6, null, 0, 0, 64); -_7010(7, null, 0, 0, 0); -_7010(8, null, 0, 0, 0); -_7010(10, null, 1, 0, 0); -_7010(14, null, 1, 0, 0); -_7010(9, null, 1, 0, 0); -_7010(11, null, 1, 0, 0); -_7010(12, null, 1, 0, 0); -_7010(13, null, 1, 0, 0); -_7010(15, null, 0, 0, 0); -_7015(0, null, 0, 0, 0); -_7015(1, null, 0, 0, 0); -_7015(2, null, 0, 0, 0); -_7015(3, null, 0, 0, 0); -_7015(4, null, 0, 0, 0); -_7015(5, null, 0, 0, 0); -_7015(6, null, 0, 0, 64); -_7015(7, null, 0, 0, 0); -_7015(8, null, 0, 0, 0); -_7015(9, null, 0, 0, 0); -_7015(10, null, 0, 0, 0); -_7015(11, null, 0, 0, 0); -_7015(12, null, 0, 0, 0); -_7015(13, null, 0, 0, 0); -_7040(0, null, 0, 0, 0); -_7040(1, null, 0, 0, 0); -_7040(2, null, 0, 0, 0); -_7040(3, null, 0, 0, 0); -_7040(4, null, 0, 0, 0); -_7040(4, null, 0, 0, 0); -_7040(5, null, 0, 0, 0); -_7040(6, null, 0, 0, 64); -_7040(7, null, 0, 0, 0); -_7040(8, null, 0, 0, 0); -_7040(9, null, 0, 0, 0); -_7040(10, null, 0, 0, 0); -_7040(11, null, 0, 0, 0); -_7040(12, null, 0, 0, 0); -_7040(13, null, 0, 0, 0); -_7040(14, null, 0, 0, 0); -_7040(15, null, 0, 0, 0); -_7040(16, null, 0, 0, 0); -_7040(17, null, 0, 0, 0); -_7040(18, null, 0, 0, 0); -_7040(19, null, 0, 0, 0); -_7040(20, null, 0, 0, 0); -_7040(21, null, 0, 0, 0); -_7040(22, null, 0, 0, 0); -_7040(23, null, 0, 0, 0); -_7040(24, null, 0, 0, 0); -_7040(25, null, 0, 0, 0); -_7040(26, null, 0, 0, 0); -_7040(27, null, 0, 0, 0); -_7040(28, null, 0, 0, 0); -_7040(29, null, 0, 0, 0); -_7040(30, null, 0, 0, 0); -_7040(31, null, 0, 0, 0); -_6709(1); -_6701(1); -_6701(2); +highlight_tile_setup(0, null, 0, 0, 0); +highlight_tile_setup(1, null, 0, 0, 0); +highlight_tile_setup(2, null, 0, 0, 0); +highlight_tile_setup(3, null, 0, 0, 0); +highlight_tile_setup(4, null, 0, 0, 0); +highlight_tile_setup(5, null, 0, 0, 0); +highlight_tile_setup(6, null, 0, 0, 64); +highlight_tile_setup(7, null, 0, 0, 0); +highlight_tile_setup(8, null, 0, 0, 0); +highlight_tile_setup(9, null, 0, 0, 0); +highlight_tile_setup(10, null, 0, 0, 0); +highlight_player_setup(0, null, 0, 0, 0); +highlight_player_setup(1, null, 0, 0, 0); +highlight_player_setup(2, null, 0, 0, 0); +highlight_player_setup(3, null, 0, 0, 0); +highlight_player_setup(4, null, 0, 0, 0); +highlight_player_setup(5, null, 0, 0, 0); +highlight_player_setup(6, null, 0, 0, 64); +highlight_player_setup(7, null, 0, 0, 0); +highlight_player_setup(8, null, 0, 0, 0); +highlight_player_setup(9, null, 0, 0, 0); +highlight_player_setup(10, null, 0, 0, 0); +highlight_npc_setup(0, null, 0, 0, 0); +highlight_npc_setup(1, null, 0, 0, 0); +highlight_npc_setup(2, null, 0, 0, 0); +highlight_npc_setup(3, null, 0, 0, 0); +highlight_npc_setup(4, null, 0, 0, 0); +highlight_npc_setup(5, null, 0, 0, 0); +highlight_npc_setup(6, null, 0, 0, 64); +highlight_npc_setup(7, null, 0, 0, 0); +highlight_npc_setup(8, null, 0, 0, 0); +highlight_npc_setup(9, null, 0, 0, 0); +highlight_npc_setup(10, null, 0, 0, 0); +highlight_npc_setup(11, null, 0, 0, 0); +highlight_npctype_setup(0, null, 0, 0, 0); +highlight_npctype_setup(1, null, 0, 0, 0); +highlight_npctype_setup(2, null, 0, 0, 0); +highlight_npctype_setup(3, null, 0, 0, 0); +highlight_npctype_setup(4, null, 0, 0, 0); +highlight_npctype_setup(5, null, 0, 0, 0); +highlight_npctype_setup(6, null, 0, 0, 64); +highlight_npctype_setup(7, null, 0, 0, 0); +highlight_npctype_setup(8, null, 0, 0, 0); +highlight_npctype_setup(9, null, 0, 0, 0); +highlight_npctype_setup(10, null, 0, 0, 0); +highlight_npctype_setup(11, null, 0, 0, 0); +highlight_npctype_setup(12, null, 0, 0, 0); +highlight_obj_setup(0, null, 0, 0, 0); +highlight_obj_setup(1, null, 0, 0, 0); +highlight_obj_setup(2, null, 0, 0, 0); +highlight_obj_setup(3, null, 0, 0, 0); +highlight_obj_setup(4, null, 0, 0, 0); +highlight_obj_setup(5, null, 0, 0, 0); +highlight_obj_setup(6, null, 0, 0, 64); +highlight_obj_setup(7, null, 0, 0, 0); +highlight_obj_setup(8, null, 0, 0, 0); +highlight_obj_setup(9, null, 0, 0, 0); +highlight_obj_setup(10, null, 0, 0, 0); +highlight_obj_setup(11, null, 0, 0, 0); +highlight_obj_setup(12, null, 0, 0, 0); +highlight_objtype_setup(0, null, 0, 0, 0); +highlight_objtype_setup(1, null, 0, 0, 0); +highlight_objtype_setup(2, null, 0, 0, 0); +highlight_objtype_setup(3, null, 0, 0, 0); +highlight_objtype_setup(4, null, 0, 0, 0); +highlight_objtype_setup(5, null, 0, 0, 0); +highlight_objtype_setup(6, null, 0, 0, 64); +highlight_objtype_setup(7, null, 0, 0, 0); +highlight_objtype_setup(8, null, 0, 0, 0); +highlight_objtype_setup(9, null, 0, 0, 0); +highlight_loc_setup(0, null, 0, 0, 0); +highlight_loc_setup(1, null, 0, 0, 0); +highlight_loc_setup(2, null, 0, 0, 0); +highlight_loc_setup(3, null, 0, 0, 0); +highlight_loc_setup(4, null, 0, 0, 0); +highlight_loc_setup(5, null, 0, 0, 0); +highlight_loc_setup(6, null, 0, 0, 64); +highlight_loc_setup(7, null, 0, 0, 0); +highlight_loc_setup(8, null, 0, 0, 0); +highlight_loc_setup(10, null, 1, 0, 0); +highlight_loc_setup(14, null, 1, 0, 0); +highlight_loc_setup(9, null, 1, 0, 0); +highlight_loc_setup(11, null, 1, 0, 0); +highlight_loc_setup(12, null, 1, 0, 0); +highlight_loc_setup(13, null, 1, 0, 0); +highlight_loc_setup(15, null, 0, 0, 0); +highlight_loctype_setup(0, null, 0, 0, 0); +highlight_loctype_setup(1, null, 0, 0, 0); +highlight_loctype_setup(2, null, 0, 0, 0); +highlight_loctype_setup(3, null, 0, 0, 0); +highlight_loctype_setup(4, null, 0, 0, 0); +highlight_loctype_setup(5, null, 0, 0, 0); +highlight_loctype_setup(6, null, 0, 0, 64); +highlight_loctype_setup(7, null, 0, 0, 0); +highlight_loctype_setup(8, null, 0, 0, 0); +highlight_loctype_setup(9, null, 0, 0, 0); +highlight_loctype_setup(10, null, 0, 0, 0); +highlight_loctype_setup(11, null, 0, 0, 0); +highlight_loctype_setup(12, null, 0, 0, 0); +highlight_loctype_setup(13, null, 0, 0, 0); +highlight_group_setup(0, null, 0, 0, 0); +highlight_group_setup(1, null, 0, 0, 0); +highlight_group_setup(2, null, 0, 0, 0); +highlight_group_setup(3, null, 0, 0, 0); +highlight_group_setup(4, null, 0, 0, 0); +highlight_group_setup(4, null, 0, 0, 0); +highlight_group_setup(5, null, 0, 0, 0); +highlight_group_setup(6, null, 0, 0, 64); +highlight_group_setup(7, null, 0, 0, 0); +highlight_group_setup(8, null, 0, 0, 0); +highlight_group_setup(9, null, 0, 0, 0); +highlight_group_setup(10, null, 0, 0, 0); +highlight_group_setup(11, null, 0, 0, 0); +highlight_group_setup(12, null, 0, 0, 0); +highlight_group_setup(13, null, 0, 0, 0); +highlight_group_setup(14, null, 0, 0, 0); +highlight_group_setup(15, null, 0, 0, 0); +highlight_group_setup(16, null, 0, 0, 0); +highlight_group_setup(17, null, 0, 0, 0); +highlight_group_setup(18, null, 0, 0, 0); +highlight_group_setup(19, null, 0, 0, 0); +highlight_group_setup(20, null, 0, 0, 0); +highlight_group_setup(21, null, 0, 0, 0); +highlight_group_setup(22, null, 0, 0, 0); +highlight_group_setup(23, null, 0, 0, 0); +highlight_group_setup(24, null, 0, 0, 0); +highlight_group_setup(25, null, 0, 0, 0); +highlight_group_setup(26, null, 0, 0, 0); +highlight_group_setup(27, null, 0, 0, 0); +highlight_group_setup(28, null, 0, 0, 0); +highlight_group_setup(29, null, 0, 0, 0); +highlight_group_setup(30, null, 0, 0, 0); +highlight_group_setup(31, null, 0, 0, 0); +shiftop_tile_del(1); +shiftop_npc_del(1); +shiftop_npc_del(2); diff --git a/scripts/[proc,script7120].cs2 b/scripts/[proc,if_subcount].cs2 similarity index 71% rename from scripts/[proc,script7120].cs2 rename to scripts/[proc,if_subcount].cs2 index 1cee061c3..1fb15e457 100644 --- a/scripts/[proc,script7120].cs2 +++ b/scripts/[proc,if_subcount].cs2 @@ -1,5 +1,5 @@ // 7120 -[proc,script7120](component $component0)(int) +[proc,if_subcount](component $component0)(int) def_int $int1 = 0; while (cc_find($component0, $int1) = ^true) { $int1 = calc($int1 + 1); diff --git a/scripts/[proc,keyboard_show_string].cs2 b/scripts/[proc,keyboard_show_string].cs2 index a3efd4ab6..e9373ca86 100644 --- a/scripts/[proc,keyboard_show_string].cs2 +++ b/scripts/[proc,keyboard_show_string].cs2 @@ -7,7 +7,7 @@ if (~on_mobile = false) { %varcint216 = $int1; switch_int ($int0) { case 0 : - _6522($string0, $int1); + mobile_keyboardshowstring($string0, $int1); case 1 : - _6523($string0, $int1); + mobile_keyboardshowinteger($string0, $int1); } diff --git a/scripts/[proc,loadnpc_cluehelper_generic].cs2 b/scripts/[proc,loadnpc_cluehelper_generic].cs2 index a8bcea629..67dfa0db3 100644 --- a/scripts/[proc,loadnpc_cluehelper_generic].cs2 +++ b/scripts/[proc,loadnpc_cluehelper_generic].cs2 @@ -1,6 +1,6 @@ // 6721 [proc,loadnpc_cluehelper_generic](entityoverlay $entityoverlay0, dbrow $dbrow1, npc_uid $npc_uid2, int $int3) -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); highlight_npc_off($npc_uid2, $int3, 9); if ($dbrow1 = null) { return; diff --git a/scripts/[proc,loadnpc_cluehelper_generic_setup].cs2 b/scripts/[proc,loadnpc_cluehelper_generic_setup].cs2 index d8bc3ef3b..9a97ab01c 100644 --- a/scripts/[proc,loadnpc_cluehelper_generic_setup].cs2 +++ b/scripts/[proc,loadnpc_cluehelper_generic_setup].cs2 @@ -1,7 +1,7 @@ // 6719 [proc,loadnpc_cluehelper_generic_setup] -def_entityoverlay $entityoverlay0 = _7200(3, 1, calc(36 * 2), calc(32 * 2), 1); -if (_202($entityoverlay0) = ^true) { +def_entityoverlay $entityoverlay0 = entityoverlay_create_npc(3, 1, calc(36 * 2), calc(32 * 2), 1); +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("loadnpc_cluehelper_generic_transmit($entityoverlay0, %var3546, npc_uid, npc_spawncycle, %varbit14189){var3546, var3543}"); } ~loadnpc_cluehelper_generic($entityoverlay0, %var3546, npc_uid, npc_spawncycle); diff --git a/scripts/[proc,loadnpc_cluehelper_uri_overlay].cs2 b/scripts/[proc,loadnpc_cluehelper_uri_overlay].cs2 index 2cf14673d..6a21c7ac3 100644 --- a/scripts/[proc,loadnpc_cluehelper_uri_overlay].cs2 +++ b/scripts/[proc,loadnpc_cluehelper_uri_overlay].cs2 @@ -13,12 +13,12 @@ highlight_npc_on($npc_uid1, $int2, 9); if (%varbit14189 = 0) { return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(enum(int, obj, enum_4616, ~cluehelper_clue_difficulty(%var3546)), 1); cc_setoutline(1); -_103($entityoverlay0, ^iftype_graphic, 1); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 1); cc_setsize(32, 32, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("emotes,44"); diff --git a/scripts/[proc,local_notification].cs2 b/scripts/[proc,local_notification].cs2 index 8353cdd53..8b499ae16 100644 --- a/scripts/[proc,local_notification].cs2 +++ b/scripts/[proc,local_notification].cs2 @@ -6,4 +6,4 @@ if (~on_enhanced_any = 0) { if (string_length($string0) <= 0) { return; } -def_int $int0 = local_notification($string0, $string1, 0, 0); +def_int $int0 = notifications_sendlocal($string0, $string1, 0, 0); diff --git a/scripts/[proc,script7132].cs2 b/scripts/[proc,loottools_size].cs2 similarity index 92% rename from scripts/[proc,script7132].cs2 rename to scripts/[proc,loottools_size].cs2 index ec8855939..647a01daf 100644 --- a/scripts/[proc,script7132].cs2 +++ b/scripts/[proc,loottools_size].cs2 @@ -1,5 +1,5 @@ // 7132 -[proc,script7132] +[proc,loottools_size] if_sethide(true, interface_650:19); if_sethide(true, interface_650:43); switch_int (%varbit14883) { diff --git a/scripts/[proc,script7190].cs2 b/scripts/[proc,loottracker_login].cs2 similarity index 57% rename from scripts/[proc,script7190].cs2 rename to scripts/[proc,loottracker_login].cs2 index ccd8ea815..a0d1577f3 100644 --- a/scripts/[proc,script7190].cs2 +++ b/scripts/[proc,loottracker_login].cs2 @@ -1,4 +1,4 @@ // 7190 -[proc,script7190] +[proc,loottracker_login] ~script7166; ~script7133; diff --git a/scripts/[proc,script7178].cs2 b/scripts/[proc,loottracker_value_item].cs2 similarity index 86% rename from scripts/[proc,script7178].cs2 rename to scripts/[proc,loottracker_value_item].cs2 index 440b2b1bf..2e0b71261 100644 --- a/scripts/[proc,script7178].cs2 +++ b/scripts/[proc,loottracker_value_item].cs2 @@ -1,5 +1,5 @@ // 7178 -[proc,script7178](obj $obj0)(int, int, int) +[proc,loottracker_value_item](obj $obj0)(int, int, int) def_int $colour1 = ^black; def_int $int2 = 0; def_int $int3 = 0; diff --git a/scripts/[proc,script7084].cs2 b/scripts/[proc,makeover_create_dropdown].cs2 similarity index 84% rename from scripts/[proc,script7084].cs2 rename to scripts/[proc,makeover_create_dropdown].cs2 index 314a0fda4..1b004c9e3 100644 --- a/scripts/[proc,script7084].cs2 +++ b/scripts/[proc,makeover_create_dropdown].cs2 @@ -1,5 +1,5 @@ // 7084 -[proc,script7084](component $component0, component $component1, component $component2, int $int3, int $int4) +[proc,makeover_create_dropdown](component $component0, component $component1, component $component2, int $int3, int $int4) def_int $colour5 = 0xff981f; def_int $int6 = 44; def_int $int7 = 81; @@ -40,8 +40,8 @@ if ($int4 = 0) { } else { cc_setcolour($colour5); if (~on_mobile = false) { - cc_setonmouseover("script7088($component1, $int3)"); - cc_setonmouseleave("script7089($component1, $int3, $colour5)"); + cc_setonmouseover("makeover_info_mouseover($component1, $int3)"); + cc_setonmouseleave("makeover_info_mouseleave($component1, $int3, $colour5)"); } cc_setop(1, "View Hair"); cc_setonop("script7087($component0, $component1, $component2)"); @@ -72,8 +72,8 @@ if ($int4 = 1) { } else { cc_setcolour($colour5); if (~on_mobile = false) { - cc_setonmouseover("script7088($component1, $int3)"); - cc_setonmouseleave("script7089($component1, $int3, $colour5)"); + cc_setonmouseover("makeover_info_mouseover($component1, $int3)"); + cc_setonmouseleave("makeover_info_mouseleave($component1, $int3, $colour5)"); } cc_setop(1, "View Facial hair"); cc_setonop("script7087($component0, $component1, $component2)"); diff --git a/scripts/[proc,script7077].cs2 b/scripts/[proc,makeover_draw_colours].cs2 similarity index 81% rename from scripts/[proc,script7077].cs2 rename to scripts/[proc,makeover_draw_colours].cs2 index dea8b2d5e..573ce7b09 100644 --- a/scripts/[proc,script7077].cs2 +++ b/scripts/[proc,makeover_draw_colours].cs2 @@ -1,5 +1,5 @@ // 7077 -[proc,script7077](component $component0) +[proc,makeover_draw_colours](component $component0) cc_deleteall($component0); def_int $int1 = 28; def_int $int2 = 28; @@ -29,10 +29,10 @@ while ($int4 < enum_getoutputcount(enum_890)) { cc_setcolour($colour10); cc_setop(1, "Colour"); cc_setopbase(""); - cc_setonop("script7081(event_com, event_comsubid)"); + cc_setonop("makeover_op_colour(event_com, event_comsubid)"); if (~on_mobile = false) { - cc_setonmouserepeat("script7079(event_com, event_comsubid, true)"); - cc_setonmouseleave("script7079(event_com, event_comsubid, false)"); + cc_setonmouserepeat("makeover_hover_colour(event_com, event_comsubid, true)"); + cc_setonmouseleave("makeover_hover_colour(event_com, event_comsubid, false)"); } $int3 = calc($int3 + 1); cc_create($component0, ^iftype_rectangle, $int3); diff --git a/scripts/[proc,makeover_draw_content].cs2 b/scripts/[proc,makeover_draw_content].cs2 new file mode 100644 index 000000000..eb9c5921f --- /dev/null +++ b/scripts/[proc,makeover_draw_content].cs2 @@ -0,0 +1,7 @@ +// 7070 +[proc,makeover_draw_content](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6) +~makeover_draw_items($component1, $component6); +~makeover_draw_scrollbar($component1, $component5); +~script7074($component2); +~makeover_draw_colours($component3); +~makeover_draw_select_button($component4, 0); diff --git a/scripts/[proc,script7073].cs2 b/scripts/[proc,makeover_draw_item].cs2 similarity index 84% rename from scripts/[proc,script7073].cs2 rename to scripts/[proc,makeover_draw_item].cs2 index 4d5ccc776..8402f4f84 100644 --- a/scripts/[proc,script7073].cs2 +++ b/scripts/[proc,makeover_draw_item].cs2 @@ -1,17 +1,17 @@ // 7073 -[proc,script7073](component $component0, dbrow $dbrow1, int $int2, int $int3, int $int4)(int) +[proc,makeover_draw_item](component $component0, dbrow $dbrow1, int $int2, int $int3, int $int4)(int) if (%varcint1148 = $int2) { ~create_graphic($component0, $int2, "tradebacking_light", $int3, $int4, ^setpos_abs_centre, ^setpos_abs_top, 85, 80, ^setsize_abs, ^setsize_abs); } else { ~create_graphic($component0, $int2, "tradebacking_dark", $int3, $int4, ^setpos_abs_centre, ^setpos_abs_top, 85, 80, ^setsize_abs, ^setsize_abs); } if (~on_mobile = false) { - cc_setonmouserepeat("script7078(event_com, event_comsubid, true)"); - cc_setonmouseleave("script7078(event_com, event_comsubid, false)"); + cc_setonmouserepeat("makeover_hover_item(event_com, event_comsubid, true)"); + cc_setonmouseleave("makeover_hover_item(event_com, event_comsubid, false)"); } cc_setop(1, "Preview"); cc_setopbase("Hair-style"); -cc_setonop("script7080(event_com, event_comsubid)"); +cc_setonop("makeover_op_item(event_com, event_comsubid)"); $int2 = calc($int2 + 1); cc_create($component0, ^iftype_rectangle, $int2); cc_setsize(85, 80, ^setsize_abs, ^setsize_abs); diff --git a/scripts/[proc,script7072].cs2 b/scripts/[proc,makeover_draw_items].cs2 similarity index 83% rename from scripts/[proc,script7072].cs2 rename to scripts/[proc,makeover_draw_items].cs2 index ca8060020..1acc09a02 100644 --- a/scripts/[proc,script7072].cs2 +++ b/scripts/[proc,makeover_draw_items].cs2 @@ -1,5 +1,5 @@ // 7072 -[proc,script7072](component $component0, component $component1) +[proc,makeover_draw_items](component $component0, component $component1) cc_deleteall($component0); def_int $int2 = 100; def_int $int3 = 90; @@ -30,7 +30,7 @@ while ($count11 < $count13) { } else { $int6 = calc($int6 + $int2); } - $int9 = ~script7073($component0, $dbrow12, $int9, $int6, $int7); + $int9 = ~makeover_draw_item($component0, $dbrow12, $int9, $int6, $int7); $int8 = calc($int8 + 1); $count11 = calc($count11 + 1); } diff --git a/scripts/[proc,script7071].cs2 b/scripts/[proc,makeover_draw_scrollbar].cs2 similarity index 91% rename from scripts/[proc,script7071].cs2 rename to scripts/[proc,makeover_draw_scrollbar].cs2 index ccf85b2db..0ecd07ff8 100644 --- a/scripts/[proc,script7071].cs2 +++ b/scripts/[proc,makeover_draw_scrollbar].cs2 @@ -1,5 +1,5 @@ // 7071 -[proc,script7071](component $component0, component $component1) +[proc,makeover_draw_scrollbar](component $component0, component $component1) cc_deleteall($component1); def_int $height2 = if_getheight($component0); def_int $int3 = -1; diff --git a/scripts/[proc,script7068].cs2 b/scripts/[proc,makeover_draw_select_button].cs2 similarity index 93% rename from scripts/[proc,script7068].cs2 rename to scripts/[proc,makeover_draw_select_button].cs2 index e8394276a..1c536a3a9 100644 --- a/scripts/[proc,script7068].cs2 +++ b/scripts/[proc,makeover_draw_select_button].cs2 @@ -1,5 +1,5 @@ // 7068 -[proc,script7068](component $component0, int $int1) +[proc,makeover_draw_select_button](component $component0, int $int1) def_int $comsubid2 = 0; if ($int1 = 0) { $comsubid2 = ~v2_stone_button_filled($component0); diff --git a/scripts/[proc,script7091].cs2 b/scripts/[proc,makeover_size_check].cs2 similarity index 53% rename from scripts/[proc,script7091].cs2 rename to scripts/[proc,makeover_size_check].cs2 index 2326e1a6b..987ccf981 100644 --- a/scripts/[proc,script7091].cs2 +++ b/scripts/[proc,makeover_size_check].cs2 @@ -1,5 +1,5 @@ // 7091 -[proc,script7091](component $component0, component $component1, int $width2, int $height3, component $component4, component $component5) +[proc,makeover_size_check](component $component0, component $component1, int $width2, int $height3, component $component4, component $component5) def_int $width6 = if_getwidth($component1); def_int $height7 = if_getheight($component1); if ($width6 = $width2 & $height7 = $height3) { @@ -8,5 +8,5 @@ if ($width6 = $width2 & $height7 = $height3) { def_int $int8 = ~min(800, calc($height7 - 3)); if_setsize(512, $int8, ^setsize_abs, ^setsize_abs, $component0); if_setposition(0, calc(($height7 - $int8) / 2), ^setpos_abs_centre, ^setpos_abs_bottom, $component0); -~script7071($component5, $component4); -if_setontimer("script7090($component0, $component1, $width6, $height7, $component4, $component5)", $component0); +~makeover_draw_scrollbar($component5, $component4); +if_setontimer("makeover_size_check($component0, $component1, $width6, $height7, $component4, $component5)", $component0); diff --git a/scripts/[proc,mouseover_entity_highlight].cs2 b/scripts/[proc,mouseover_entity_highlight].cs2 index 3cf3e333a..ee8f402a7 100644 --- a/scripts/[proc,mouseover_entity_highlight].cs2 +++ b/scripts/[proc,mouseover_entity_highlight].cs2 @@ -2,7 +2,7 @@ [proc,mouseover_entity_highlight] ~entity_highlight_clear(5); def_int $minimenu_entry_type0 = get_active_minimenu_entry_type; -if (%varbit13088 = 0 | $minimenu_entry_type0 = 1 | $minimenu_entry_type0 = ^minimenu_entry_type_default) { +if (%varbit13088 = 0 | $minimenu_entry_type0 = ^minimenu_entry_type_tile | $minimenu_entry_type0 = ^minimenu_entry_type_none) { return; } if ($minimenu_entry_type0 = ^minimenu_entry_type_npc & npc_find_active_minimenu_entry = true) { diff --git a/scripts/[proc,mouseover_ops].cs2 b/scripts/[proc,mouseover_ops].cs2 index 78bdb3d0c..261d94c4b 100644 --- a/scripts/[proc,mouseover_ops].cs2 +++ b/scripts/[proc,mouseover_ops].cs2 @@ -18,7 +18,7 @@ cc_deleteall($component3); if ($int1 = 1) { ~mouseover_entity_highlight; } -if (_7108 = true) { +if (component_find_active_minimenu_entry = true) { return; } def_int $int4 = 0; diff --git a/scripts/[proc,mouseover_tooltip].cs2 b/scripts/[proc,mouseover_tooltip].cs2 index 5feaee4e5..438f3afae 100644 --- a/scripts/[proc,mouseover_tooltip].cs2 +++ b/scripts/[proc,mouseover_tooltip].cs2 @@ -4,7 +4,7 @@ def_int $int5 = 1; def_int $int6 = 1; if (%varbit12344 = 1 | enum(int, boolean, enum_3903, $minimenu_entry_type2) = false | ~on_mobile = true) { $int5 = 0; -} else if ($minimenu_entry_type2 = 7 & targetmode_active = true) { +} else if ($minimenu_entry_type2 = ^minimenu_entry_type_component & targetmode_active = true) { switch_component (cc_getlayer) { case magic_spellbook:3 : $int5 = 0; diff --git a/scripts/[proc,npc_name_create].cs2 b/scripts/[proc,npc_name_create].cs2 index 006a77227..7c03fceaa 100644 --- a/scripts/[proc,npc_name_create].cs2 +++ b/scripts/[proc,npc_name_create].cs2 @@ -1,7 +1,7 @@ // 6698 [proc,npc_name_create](entityoverlay $entityoverlay0, npc_uid $npc_uid1, int $int2, string $string0, npc $npc3) -_104($entityoverlay0); -if (_202($entityoverlay0) = ^true) { +cc_deleteall_entityoverlay($entityoverlay0); +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setsize(1, 1, ^setsize_abs, ^setsize_abs); } if (%varbit542 = 1) { @@ -10,7 +10,7 @@ if (%varbit542 = 1) { def_fontmetrics $fontmetrics4 = null; def_fontmetrics $fontmetrics5 = null; def_int $colour6 = ^black; -if (%varbit14168 = 1 & %varbit14169 > 0 & (_7043(~script6690($npc3), 6) = true | _7003($npc_uid1, $int2, 6) = true)) { +if (%varbit14168 = 1 & %varbit14169 > 0 & (highlight_group_get(~script6690($npc3), 6) = true | highlight_npc_get($npc_uid1, $int2, 6) = true)) { if (%varbit14169 = 1) { $fontmetrics4, $fontmetrics5 = p12_full, p12_full; } else { @@ -27,7 +27,7 @@ if (%varbit14168 = 1 & %varbit14169 > 0 & (_7043(~script6690($npc3), 6) = true | } else { return; } -_103($entityoverlay0, ^iftype_text, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_text, 0); def_int $width7 = parawidth($string0, 1000, $fontmetrics4); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setsize($width7, 20, ^setsize_abs, ^setsize_abs); @@ -36,6 +36,6 @@ cc_settextfont($fontmetrics5); cc_settextalign(^settextalign_centre, ^settextalign_centre, 20); cc_settextshadow(true); cc_settext($string0); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setsize($width7, 20, ^setsize_abs, ^setsize_abs); } diff --git a/scripts/[proc,npc_name_setup].cs2 b/scripts/[proc,npc_name_setup].cs2 index 7f5a8f479..a67366b39 100644 --- a/scripts/[proc,npc_name_setup].cs2 +++ b/scripts/[proc,npc_name_setup].cs2 @@ -3,8 +3,8 @@ if (~on_enhanced_any = 0) { return; } -def_entityoverlay $entityoverlay3 = _7200(2, 1, 1, 1, 1); -if (_202($entityoverlay3) = ^true) { +def_entityoverlay $entityoverlay3 = entityoverlay_create_npc(2, 1, 1, 1, 1); +if (if_find_entityoverlay($entityoverlay3) = ^true) { cc_setonvartransmit("npc_name_vartransmit($entityoverlay3, $npc_uid0, $int1, $string0, $npc2, %var3416, %var3417, %var3540, %var3541, %var3542, %var1021){var3416, var3417, var3540, var3541, var1021, var3542}"); cc_setontimer("npc_name_timer(%varcint1079, $entityoverlay3, $npc_uid0, $int1, $string0, $npc2)"); } diff --git a/scripts/[proc,popout_tooltip_hook_cc].cs2 b/scripts/[proc,popout_tooltip_hook_cc].cs2 index 8a571d9dd..87b9ab70a 100644 --- a/scripts/[proc,popout_tooltip_hook_cc].cs2 +++ b/scripts/[proc,popout_tooltip_hook_cc].cs2 @@ -5,7 +5,7 @@ if (~on_mobile = true) { cc_setonmouserepeat(null); cc_setonmouseleave(null); } else { - cc_setonmouseleave("script5547"); + cc_setonmouseleave("popout_tooltip_clear_clientscript"); cc_setonclick(null); cc_setnoclickthrough(false); } diff --git a/scripts/[proc,popout_tooltip_hook_if].cs2 b/scripts/[proc,popout_tooltip_hook_if].cs2 index 363874da6..ae02a5ae6 100644 --- a/scripts/[proc,popout_tooltip_hook_if].cs2 +++ b/scripts/[proc,popout_tooltip_hook_if].cs2 @@ -5,7 +5,7 @@ if (~on_mobile = true) { if_setonmouserepeat(null, $component0); if_setonmouseleave(null, $component0); } else { - if_setonmouseleave("script5547", $component0); + if_setonmouseleave("popout_tooltip_clear_clientscript", $component0); if_setonclick(null, $component0); if_setnoclickthrough(false, $component0); } diff --git a/scripts/[proc,pvp_icons_layout].cs2 b/scripts/[proc,pvp_icons_layout].cs2 index cef8892ae..32e1c0893 100644 --- a/scripts/[proc,pvp_icons_layout].cs2 +++ b/scripts/[proc,pvp_icons_layout].cs2 @@ -32,7 +32,7 @@ if (~pvp_world = 1) { if_setsize(78, 73, ^setsize_abs, ^setsize_abs, interface_90:44); if (%varbit5320 > 0 & %varbit5316 > 0) { if_sethide(false, interface_328:1); - _2125(2, interface_328:1); + if_setgradientmode(2, interface_328:1); if_setontimer("br_fogcolour", interface_328:1); ~br_fogcolour; } else { @@ -75,7 +75,7 @@ if (~pvp_world = 1) { if_sethide(false, interface_90:38); } if_sethide(false, interface_90:1); - _2125(2, interface_90:1); + if_setgradientmode(2, interface_90:1); if_setontimer("deadman_tournament_fogcolour", interface_90:1); ~deadman_tournament_fogcolour; } else { @@ -146,7 +146,7 @@ if (~pvp_world = 1) { if_setgraphic("overlay_duel", interface_90:46); } if_sethide(false, interface_90:1); - _2125(2, interface_90:1); + if_setgradientmode(2, interface_90:1); ~script6247(interface_90:1); if_setontimer("script6246(event_com)", interface_90:1); } else { @@ -178,7 +178,7 @@ if (~pvp_world = 1) { if_sethide(false, interface_90:38); } if_sethide(false, interface_90:1); - _2125(2, interface_90:1); + if_setgradientmode(2, interface_90:1); if_setontimer("wildwars_fogcolour", interface_90:1); ~wildwars_fogcolour; } else { diff --git a/scripts/[proc,quickprayer_button_update].cs2 b/scripts/[proc,quickprayer_button_update].cs2 index d39d0401f..1cdf5e092 100644 --- a/scripts/[proc,quickprayer_button_update].cs2 +++ b/scripts/[proc,quickprayer_button_update].cs2 @@ -1,7 +1,7 @@ // 471 [proc,quickprayer_button_update](obj $obj0) cc_setopbase(""); -if (testbit(~script7054, oc_param($obj0, param_630)) = ^true) { +if (testbit(~quickprayer_selected_get, oc_param($obj0, param_630)) = ^true) { .cc_setgraphic("miscgraphics,11"); } else { .cc_setgraphic("miscgraphics,10"); diff --git a/scripts/[proc,script7054].cs2 b/scripts/[proc,quickprayer_selected_get].cs2 similarity index 74% rename from scripts/[proc,script7054].cs2 rename to scripts/[proc,quickprayer_selected_get].cs2 index 04e186f17..8e38b95fe 100644 --- a/scripts/[proc,script7054].cs2 +++ b/scripts/[proc,quickprayer_selected_get].cs2 @@ -1,5 +1,5 @@ // 7054 -[proc,script7054]()(int) +[proc,quickprayer_selected_get]()(int) if (%varbit14826 = 0) { return(%varbit4102); } diff --git a/scripts/[proc,script7055].cs2 b/scripts/[proc,quickprayer_selected_set].cs2 similarity index 70% rename from scripts/[proc,script7055].cs2 rename to scripts/[proc,quickprayer_selected_set].cs2 index 04e5f97dc..6441f2f29 100644 --- a/scripts/[proc,script7055].cs2 +++ b/scripts/[proc,quickprayer_selected_set].cs2 @@ -1,5 +1,5 @@ // 7055 -[proc,script7055](int $flags0) +[proc,quickprayer_selected_set](int $flags0) if (%varbit14826 = 0) { %varbit4102 = $flags0; } diff --git a/scripts/[proc,script3153].cs2 b/scripts/[proc,runweight_update].cs2 similarity index 59% rename from scripts/[proc,script3153].cs2 rename to scripts/[proc,runweight_update].cs2 index d01c89692..7789ad49e 100644 --- a/scripts/[proc,script3153].cs2 +++ b/scripts/[proc,runweight_update].cs2 @@ -1,3 +1,3 @@ // 3153 -[proc,script3153](component $component0) +[proc,runweight_update](component $component0) if_settext(" kg", $component0); diff --git a/scripts/[proc,script3721].cs2 b/scripts/[proc,script3721].cs2 index 6da50c80a..b3326d2af 100644 --- a/scripts/[proc,script3721].cs2 +++ b/scripts/[proc,script3721].cs2 @@ -6,6 +6,6 @@ if (~on_enhanced_any = 0) { if (map_members = ^false & struct_param($struct0, param_1264) = true & struct_param($struct0, param_1267) = true) { return; } -def_entityoverlay $entityoverlay3 = _7200(0, 1, 1, 1, 1); +def_entityoverlay $entityoverlay3 = entityoverlay_create_npc(0, 1, 1, 1, 1); ~script6902($entityoverlay3, $struct0, $npc_uid1, $int2, null, null); ~loadnpc_default; diff --git a/scripts/[proc,script4554].cs2 b/scripts/[proc,script4554].cs2 index f9ec40130..46ed4bd5e 100644 --- a/scripts/[proc,script4554].cs2 +++ b/scripts/[proc,script4554].cs2 @@ -1,6 +1,6 @@ // 4554 [proc,script4554](entityoverlay $entityoverlay0, struct $struct1) -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); if (%varbit12349 = 1) { return; } @@ -14,7 +14,7 @@ def_int $int5 = 5; def_int $int6 = 0; def_int $int7 = 5; def_int $bool8 = map_members; -_103($entityoverlay0, ^iftype_graphic, $int4); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, $int4); $int4 = calc($int4 + 1); cc_setgraphic("tradebacking"); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); @@ -37,6 +37,6 @@ if ($bool8 = ^false & struct_param($struct1, param_1267) = true) { $int5 = calc($int5 + 5); $int7 = calc($int7 + 5); $int4 = ~thinbox_entityoverlay($entityoverlay0, $int4); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setsize($int6, $int7, ^setsize_abs, ^setsize_abs); } diff --git a/scripts/[proc,script4555].cs2 b/scripts/[proc,script4555].cs2 index a99ecb5dc..76aa6ab66 100644 --- a/scripts/[proc,script4555].cs2 +++ b/scripts/[proc,script4555].cs2 @@ -4,7 +4,7 @@ if ($enum5 = null) { return($int0, 0, $int2, $int3); } if ($namedobj6 ! null) { - _103($entityoverlay4, ^iftype_graphic, $int0); + cc_create_entityoverlay($entityoverlay4, ^iftype_graphic, $int0); $int0 = calc($int0 + 1); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition($int1, $int2, ^setpos_abs_left, ^setpos_abs_top); @@ -19,7 +19,7 @@ $int8 = enum_getoutputcount($enum5); while ($int7 < $int8) { $namedobj9 = enum(int, namedobj, $enum5, $int7); if ($namedobj9 ! null) { - _103($entityoverlay4, ^iftype_graphic, $int0); + cc_create_entityoverlay($entityoverlay4, ^iftype_graphic, $int0); $int0 = calc($int0 + 1); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition($int1, $int2, ^setpos_abs_left, ^setpos_abs_top); diff --git a/scripts/[proc,script4648].cs2 b/scripts/[proc,script4648].cs2 index 7b66d38be..ebb99b5de 100644 --- a/scripts/[proc,script4648].cs2 +++ b/scripts/[proc,script4648].cs2 @@ -22,6 +22,6 @@ cc_setcolour(^black); cc_setfill(false); cc_setlinewid(6); cc_setarc(20384, 45152); -def_int $int0 = _1615; -def_int $int1 = _1616; +def_int $int0 = cc_getarcstart; +def_int $int1 = cc_getarcend; mes("start: end:"); diff --git a/scripts/[proc,script4731].cs2 b/scripts/[proc,script4731].cs2 index 4b5fcba01..7af4a8524 100644 --- a/scripts/[proc,script4731].cs2 +++ b/scripts/[proc,script4731].cs2 @@ -44,10 +44,10 @@ if_setsize(0, 0, ^setsize_minus, ^setsize_minus, $component0); if (testbit($int2, 13) = ^true & $boolean23 = true & $layer13 ! null) { ~script1282; $int33 = scale(%varcint381, 16384, $width11); - $int18 = ~max(viewport_getx, $int33); - $int19 = viewport_gety; - $int16 = ~min(viewport_getwidth, calc($width11 - $int33)); - $int17 = viewport_getheight; + $int18 = ~max(safearea_getminx, $int33); + $int19 = safearea_getminy; + $int16 = ~min(safearea_getmaxx, calc($width11 - $int33)); + $int17 = safearea_getmaxy; $component40 = null; if ($component0 = toplevel_osm:19) { if (.cc_find(toplevel_osm:2, 0) = ^true) { diff --git a/scripts/[proc,script5198].cs2 b/scripts/[proc,script5198].cs2 index 569457888..1e835b898 100644 --- a/scripts/[proc,script5198].cs2 +++ b/scripts/[proc,script5198].cs2 @@ -11,8 +11,8 @@ if (%varbit12977 = 1) { if (%varbit12980 = 1) { $int3 = calc($int3 + 16); } - _7035(5, $colour2, $int0, $int1, $int3); + highlight_tile_setup(5, $colour2, $int0, $int1, $int3); } else { - _7039(5); - _7035(5, null, 0, 0, 0); + highlight_tile_clear(5); + highlight_tile_setup(5, null, 0, 0, 0); } diff --git a/scripts/[proc,script5204].cs2 b/scripts/[proc,script5204].cs2 index c8924886c..a51392a38 100644 --- a/scripts/[proc,script5204].cs2 +++ b/scripts/[proc,script5204].cs2 @@ -11,9 +11,9 @@ if (%varbit12978 = 1) { if (%varbit12981 = 1) { $int3 = calc($int3 + 16); } - _7035(3, $colour2, $int0, $int1, $int3); + highlight_tile_setup(3, $colour2, $int0, $int1, $int3); highlight_tile_on(coord, 3, 0); } else { - _7039(3); - _7035(3, null, 0, 0, 0); + highlight_tile_clear(3); + highlight_tile_setup(3, null, 0, 0, 0); } diff --git a/scripts/[proc,script5210].cs2 b/scripts/[proc,script5210].cs2 index 803837791..5b85b8292 100644 --- a/scripts/[proc,script5210].cs2 +++ b/scripts/[proc,script5210].cs2 @@ -11,11 +11,11 @@ if (%varbit12979 = 1) { if (%varbit12982 = 1) { $int3 = calc($int3 + 16); } - _7035(4, $colour2, $int0, $int1, $int3); - if (_3330 ! null) { - highlight_tile_on(_3330, 4, 0); + highlight_tile_setup(4, $colour2, $int0, $int1, $int3); + if (destinationcoord ! null) { + highlight_tile_on(destinationcoord, 4, 0); } } else { - _7039(4); - _7035(4, null, 0, 0, 0); + highlight_tile_clear(4); + highlight_tile_setup(4, null, 0, 0, 0); } diff --git a/scripts/[proc,script5310].cs2 b/scripts/[proc,script5310].cs2 index cf66b0460..0232b5198 100644 --- a/scripts/[proc,script5310].cs2 +++ b/scripts/[proc,script5310].cs2 @@ -9,5 +9,5 @@ if_setop(7, "", interface_711:5); if_setop(8, "", interface_711:5); if_setonvartransmit(null, interface_711:5); if (~on_enhanced_any = 1) { - _2433(null, interface_711:5); + if_setonmappost(null, interface_711:5); } diff --git a/scripts/[proc,script5355].cs2 b/scripts/[proc,script5355].cs2 index ac265dbd3..f894a7266 100644 --- a/scripts/[proc,script5355].cs2 +++ b/scripts/[proc,script5355].cs2 @@ -20,7 +20,7 @@ if ($component1 ! null) { $component1 = enum(component, component, $enum0, toplevel_osrs_stretch:33); if (~on_mobile = true) { ~script1282; - $int2 = ~min(viewport_getwidth, calc(if_getwidth($component1) - scale(%varcint381, 16384, if_getwidth($component1)))); + $int2 = ~min(safearea_getmaxx, calc(if_getwidth($component1) - scale(%varcint381, 16384, if_getwidth($component1)))); $int2 = calc(if_getwidth($component1) - $int2 + 42); if ($component1 ! null) { if_setsize($int2, 0, ^setsize_minus, ^setsize_minus, $component1); @@ -30,11 +30,11 @@ if ($component1 ! null) { if_setsize($int2, 0, ^setsize_minus, ^setsize_minus, $component1); } if (~on_enhanced_desktop = 1) { - _6231(0, 42); + sidebar_setwidth(0, 42); if ($int3 = 1) { - _6231(1, 270); + sidebar_setwidth(1, 270); } else { - _6232(1); + sidebar_clearwidth(true); } } } @@ -46,8 +46,8 @@ if ($component1 ! null) { if_setsize(0, 0, ^setsize_minus, ^setsize_minus, $component1); } if (~on_enhanced_desktop = 1) { - _6232(0); - _6232(1); + sidebar_clearwidth(false); + sidebar_clearwidth(true); } } } else { @@ -56,7 +56,7 @@ if ($component1 ! null) { if_setsize(0, 0, ^setsize_minus, ^setsize_minus, $component1); } if (~on_enhanced_desktop = 1) { - _6232(0); - _6232(1); + sidebar_clearwidth(false); + sidebar_clearwidth(true); } } diff --git a/scripts/[proc,script5484].cs2 b/scripts/[proc,script5484].cs2 index 119c7a8fb..ed501c520 100644 --- a/scripts/[proc,script5484].cs2 +++ b/scripts/[proc,script5484].cs2 @@ -4,9 +4,9 @@ if (~on_enhanced_desktop = 0) { return; } if ($int0 = 0) { - _7035(6, ~script5329(^setting_tile_highlight_colour_colour), 2, 50, 90); - _6708(1, "Mark tile", 4762); + highlight_tile_setup(6, ~script5329(^setting_tile_highlight_colour_colour), 2, 50, 90); + shiftop_tile_set(1, "Mark tile", 4762); } else { - _7035(6, null, 0, 0, 64); - _6709(1); + highlight_tile_setup(6, null, 0, 0, 64); + shiftop_tile_del(1); } diff --git a/scripts/[proc,script5718].cs2 b/scripts/[proc,script5718].cs2 index 56e45d440..e9a1495c3 100644 --- a/scripts/[proc,script5718].cs2 +++ b/scripts/[proc,script5718].cs2 @@ -3,8 +3,8 @@ if (~on_enhanced_any = 0) { return; } -def_entityoverlay $entityoverlay0 = _7201(2, 0, 1, 25, 0); -if (_202($entityoverlay0) = ^true) { +def_entityoverlay $entityoverlay0 = entityoverlay_create_loc(2, 0, 1, 25, 0); +if (if_find_entityoverlay($entityoverlay0) = ^true) { ~helper_agility_vartransmit($entityoverlay0, loc_type, loc_coord); if (map_members = ^true) { if (enum(loc, int, enum_4077, loc_type) > 0) { diff --git a/scripts/[proc,script5724].cs2 b/scripts/[proc,script5724].cs2 index a2fc4b450..86bbd9f9a 100644 --- a/scripts/[proc,script5724].cs2 +++ b/scripts/[proc,script5724].cs2 @@ -1,7 +1,7 @@ // 5724 [proc,script5724](entityoverlay $entityoverlay0, loc $loc1, coord $coord2) -_104($entityoverlay0); -if (_202($entityoverlay0) = ^true) { +cc_deleteall_entityoverlay($entityoverlay0); +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonmouseleave(null); cc_setonmouseover(null); } diff --git a/scripts/[proc,script5725].cs2 b/scripts/[proc,script5725].cs2 index 120b8c83d..b4ad888e8 100644 --- a/scripts/[proc,script5725].cs2 +++ b/scripts/[proc,script5725].cs2 @@ -3,11 +3,11 @@ if (~on_mobile = true | %varbit13136 = 1 | enum(coord, int, enum_4080, $coord2) = 1) { return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(25, 25, ^setsize_abs, ^setsize_abs); cc_setposition(0, 0, ^setpos_abs_left, ^setpos_abs_top); cc_setgraphic("staticons,7"); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setsize(25, 25, ^setsize_abs, ^setsize_abs); cc_setonmouseleave("helper_agility_mouseleave($entityoverlay0, $loc1, $coord2)"); cc_setonmouseover("helper_agility_mouseover($entityoverlay0, $loc1, $coord2, $lvl3, $lvl4, $lvl5, $string0, $boolean6)"); diff --git a/scripts/[proc,script5728].cs2 b/scripts/[proc,script5728].cs2 index 8b0f95390..021195b34 100644 --- a/scripts/[proc,script5728].cs2 +++ b/scripts/[proc,script5728].cs2 @@ -1,12 +1,12 @@ // 5728 [proc,script5728](entityoverlay $entityoverlay0, loc $loc1, coord $coord2, int $lvl3, int $lvl4, int $lvl5, string $string0, boolean $boolean6) -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); if (%varbit13136 = 1) { return; } def_int $int7 = 0; def_int $int8 = 4; -_103($entityoverlay0, ^iftype_graphic, $int7); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, $int7); $int7 = calc($int7 + 1); cc_setgraphic("tradebacking"); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); @@ -16,12 +16,12 @@ cc_settiling(true); $int7 = ~thinbox_entityoverlay($entityoverlay0, $int7); def_int $int9 = 0; if ($lvl3 > 0) { - _103($entityoverlay0, ^iftype_graphic, $int7); + cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, $int7); $int7 = calc($int7 + 1); cc_setsize(25, 25, ^setsize_abs, ^setsize_abs); cc_setposition(-15, $int8, ^setpos_abs_centre, ^setpos_abs_top); cc_setgraphic("staticons,7"); - _103($entityoverlay0, ^iftype_text, $int7); + cc_create_entityoverlay($entityoverlay0, ^iftype_text, $int7); $int7 = calc($int7 + 1); cc_setposition(15, $int8, ^setpos_abs_centre, ^setpos_abs_top); cc_setsize(25, 25, ^setsize_abs, ^setsize_abs); @@ -39,12 +39,12 @@ if ($lvl3 > 0) { $int8 = calc($int8 + 25); } if ($lvl4 > 0) { - _103($entityoverlay0, ^iftype_graphic, $int7); + cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, $int7); $int7 = calc($int7 + 1); cc_setsize(25, 25, ^setsize_abs, ^setsize_abs); cc_setposition(-15, $int8, ^setpos_abs_centre, ^setpos_abs_top); cc_setgraphic("staticons,1"); - _103($entityoverlay0, ^iftype_text, $int7); + cc_create_entityoverlay($entityoverlay0, ^iftype_text, $int7); $int7 = calc($int7 + 1); cc_setposition(15, $int8, ^setpos_abs_centre, ^setpos_abs_top); cc_setsize(25, 25, ^setsize_abs, ^setsize_abs); @@ -60,12 +60,12 @@ if ($lvl4 > 0) { $int8 = calc($int8 + 25); } if ($lvl5 > 0) { - _103($entityoverlay0, ^iftype_graphic, $int7); + cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, $int7); $int7 = calc($int7 + 1); cc_setsize(25, 25, ^setsize_abs, ^setsize_abs); cc_setposition(-15, $int8, ^setpos_abs_centre, ^setpos_abs_top); cc_setgraphic("staticons,3"); - _103($entityoverlay0, ^iftype_text, $int7); + cc_create_entityoverlay($entityoverlay0, ^iftype_text, $int7); $int7 = calc($int7 + 1); cc_setposition(15, $int8, ^setpos_abs_centre, ^setpos_abs_top); cc_setsize(25, 25, ^setsize_abs, ^setsize_abs); @@ -85,7 +85,7 @@ $int8 = calc($int8 + 4); def_int $int10 = 0; if (string_length($string0) > 0) { $int10 = ~min(162, parawidth($string0, 162, p12_full)); - _103($entityoverlay0, ^iftype_text, $int7); + cc_create_entityoverlay($entityoverlay0, ^iftype_text, $int7); $int7 = calc($int7 + 1); cc_setposition(0, $int8, ^setpos_abs_centre, ^setpos_abs_top); cc_setsize($int10, calc(14 * paraheight($string0, $int10, p12_full)), ^setsize_abs, ^setsize_abs); @@ -104,6 +104,6 @@ if ($int10 > $int9) { $int9 = calc($int9 + 8); } $int8 = calc($int8 + 4); -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setsize($int9, $int8, ^setsize_abs, ^setsize_abs); } diff --git a/scripts/[proc,script5936].cs2 b/scripts/[proc,script5936].cs2 index 8ba0fc660..3df737a20 100644 --- a/scripts/[proc,script5936].cs2 +++ b/scripts/[proc,script5936].cs2 @@ -41,13 +41,13 @@ if (calc($int4 % $int16) = 0) { $int7 = 0; } cc_setscrollsize($int6, $int7); - cc_setfillcolour($int5); + cc_setgradientcolour($int5); cc_settext(~script5943($struct0, $int5)); cc_setopbase(~script5343($struct0, $int11)); if ($int5 <= 0) { cc_setscrollsize(0, 0); cc_setcolour(struct_param($struct0, param_1540)); - cc_setfillcolour(^black); + cc_setgradientcolour(^black); cc_settext(""); cc_setontimer(null); ~buff_bar_layout_redraw; diff --git a/scripts/[proc,script5961].cs2 b/scripts/[proc,script5961].cs2 index f681afd45..b4dd381bc 100644 --- a/scripts/[proc,script5961].cs2 +++ b/scripts/[proc,script5961].cs2 @@ -5,6 +5,6 @@ if (~on_enhanced_mobile = 0) { } ~entity_highlight_setup(4, 2, 128, ~script758); def_int $clock1 = clientclock; -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setontimer("script5962($clock1, $entityoverlay0, %varcint973, %varcint974, %varcint975, %varcint976, %varcint977, %varcint978, %varcstring979)"); } diff --git a/scripts/[proc,script5963].cs2 b/scripts/[proc,script5963].cs2 index a3624ba2b..205ce8e49 100644 --- a/scripts/[proc,script5963].cs2 +++ b/scripts/[proc,script5963].cs2 @@ -9,7 +9,7 @@ def_int $int10 = -1; def_int $int11 = -1; def_int $int12 = -1; def_int $int13 = -1; -if (_202($entityoverlay1) = ^true) { +if (if_find_entityoverlay($entityoverlay1) = ^true) { if ($int8 >= 17) { cc_setontimer(null); ~entity_highlight_clear(4); @@ -21,7 +21,7 @@ if (_202($entityoverlay1) = ^true) { $int10 = calc(17 - $int8); } $int11 = _7460; - if (_7108 = true) { + if (component_find_active_minimenu_entry = true) { ~entity_highlight_clear(4); ~entity_highlight_minimenu(4); if ($int8 >= $int9) { diff --git a/scripts/[proc,script5965].cs2 b/scripts/[proc,script5965].cs2 index e724caef2..074f5d6d2 100644 --- a/scripts/[proc,script5965].cs2 +++ b/scripts/[proc,script5965].cs2 @@ -1,7 +1,7 @@ // 5965 [proc,script5965] if (~on_enhanced_mobile = 1 & %varbit13666 = 0) { - _3130("graphic_4351", 1); + setclickgraphic("graphic_4351", true); } else { - _3130("clickcircle_filled", 1); + setclickgraphic("clickcircle_filled", true); } diff --git a/scripts/[proc,script5966].cs2 b/scripts/[proc,script5966].cs2 index d103c23c4..48adb5ae6 100644 --- a/scripts/[proc,script5966].cs2 +++ b/scripts/[proc,script5966].cs2 @@ -4,6 +4,6 @@ if (%varcint981 = 1) { return; } ~debug_mes("Initialising mobile analytics and attribution."); -_3177; -_3179; +marketing_initanalytics; +marketing_initattribution; %varcint981 = 1; diff --git a/scripts/[proc,script6247].cs2 b/scripts/[proc,script6247].cs2 index 71539b9f0..5210c35d3 100644 --- a/scripts/[proc,script6247].cs2 +++ b/scripts/[proc,script6247].cs2 @@ -4,7 +4,7 @@ if (%varbit14016 <= 0) { %varcint991 = 0; if_setcolour(0xff7733, $component0); if_settrans(255, $component0); - _2124(255, $component0); + if_setgradienttrans(255, $component0); return; } %varcint991 = ~max(0, %varcint991); @@ -52,11 +52,11 @@ if ($int17 < $int5) { $int17 = calc($int17 - 1); } if_setcolour(~rgb_to_hex($int15, $int16, $int17), $component0); -if_setfillcolour(~rgb_to_hex($int15, $int16, $int17), $component0); +if_setgradientcolour(~rgb_to_hex($int15, $int16, $int17), $component0); if ($int2 < $int14) { $int2 = calc($int2 + 1); } else if ($int2 > $int14) { $int2 = calc($int2 - 1); } if_settrans($int2, $component0); -_2124(255, $component0); +if_setgradienttrans(255, $component0); diff --git a/scripts/[proc,script6498].cs2 b/scripts/[proc,script6498].cs2 index 2b6c3255a..fe7ca1054 100644 --- a/scripts/[proc,script6498].cs2 +++ b/scripts/[proc,script6498].cs2 @@ -2,13 +2,13 @@ [proc,script6498](dbrow $dbrow0, loc $loc1, obj $obj2, coord $coord3, obj $obj4) def_entityoverlay $entityoverlay5 = null; if (loc_find($coord3, $loc1) = true) { - $entityoverlay5 = _7206(5); + $entityoverlay5 = entityoverlay_get_loc(5); if ($entityoverlay5 = null) { - $entityoverlay5 = _7201(5, 1, 60, 60, 1); + $entityoverlay5 = entityoverlay_create_loc(5, 1, 60, 60, 1); } else { - _104($entityoverlay5); + cc_deleteall_entityoverlay($entityoverlay5); } - if (_202($entityoverlay5) = ^true) { + if (if_find_entityoverlay($entityoverlay5) = ^true) { cc_setonvartransmit("script6499($entityoverlay5, $dbrow0, $loc1, $obj2, $coord3, $obj4, %varbit14189, %varbit14184, %varbit14182){var3546, var3543}"); } if (%varbit14182 = 0) { @@ -17,12 +17,12 @@ if (loc_find($coord3, $loc1) = true) { } if (inv_total(inv, $obj2) > 0) { if (%varbit14189 = 1) { - _103($entityoverlay5, ^iftype_graphic, 0); + cc_create_entityoverlay($entityoverlay5, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(4, 4, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum($obj4, 1); cc_setoutline(1); - _103($entityoverlay5, ^iftype_graphic, 1); + cc_create_entityoverlay($entityoverlay5, ^iftype_graphic, 1); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(-4, -4, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(key_medium_7297, 1); @@ -31,14 +31,14 @@ if (loc_find($coord3, $loc1) = true) { if (%varbit14184 = 1) { highlight_loc_on($loc1, $coord3, 9, 1); } - if (_202($entityoverlay5) = ^true) { + if (if_find_entityoverlay($entityoverlay5) = ^true) { cc_setoninvtransmit("script6500($dbrow0, $loc1, $obj2, $coord3, $obj4, 1){inv}"); } } else { highlight_loc_off($loc1, $coord3, 9, 1); - if (_202($entityoverlay5) = ^true) { + if (if_find_entityoverlay($entityoverlay5) = ^true) { cc_setoninvtransmit("script6500($dbrow0, $loc1, $obj2, $coord3, $obj4, 0){inv}"); } } - _7010(9, ^green, 2, 30, 1); + highlight_loc_setup(9, ^green, 2, 30, 1); } diff --git a/scripts/[proc,script6501].cs2 b/scripts/[proc,script6501].cs2 index c5e05803e..105731d32 100644 --- a/scripts/[proc,script6501].cs2 +++ b/scripts/[proc,script6501].cs2 @@ -1,14 +1,14 @@ // 6501 [proc,script6501](dbrow $dbrow0, coord $coord1, obj $obj2) def_entityoverlay $entityoverlay3 = null; -if (_6951($coord1) = true) { - $entityoverlay3 = _7209($coord1, 7); +if (tile_find($coord1) = true) { + $entityoverlay3 = entityoverlay_get_coord($coord1, 7); if ($entityoverlay3 = null) { - $entityoverlay3 = _7204($coord1, 7, 1, 60, 60, 1); + $entityoverlay3 = entityoverlay_create_coord($coord1, 7, 1, 60, 60, 1); } else { - _104($entityoverlay3); + cc_deleteall_entityoverlay($entityoverlay3); } - if (_202($entityoverlay3) = ^true) { + if (if_find_entityoverlay($entityoverlay3) = ^true) { cc_setonvartransmit("script6502($dbrow0, $coord1, $obj2, %varbit14189, %var3548, %var3549, %var3550, %var3547, %varbit14182, %varbit14184){var3546, var3543, var3548, var3549, var3550, var3547}"); } if (%varbit14182 = 0 | ~cluehelper_overlay_npc_active = 1) { @@ -16,12 +16,12 @@ if (_6951($coord1) = true) { return; } if (%varbit14189 = 1) { - _103($entityoverlay3, ^iftype_graphic, 0); + cc_create_entityoverlay($entityoverlay3, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum($obj2, 1); cc_setoutline(1); - _103($entityoverlay3, ^iftype_graphic, 1); + cc_create_entityoverlay($entityoverlay3, ^iftype_graphic, 1); cc_setsize(48, 48, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("emotes,44"); diff --git a/scripts/[proc,script6505].cs2 b/scripts/[proc,script6505].cs2 deleted file mode 100644 index 2b139b585..000000000 --- a/scripts/[proc,script6505].cs2 +++ /dev/null @@ -1,29 +0,0 @@ -// 6505 -[proc,script6505](dbrow $dbrow0, loc $loc1, coord $coord2, obj $obj3) -def_entityoverlay $entityoverlay4 = null; -if (loc_find($coord2, $loc1) = true) { - $entityoverlay4 = _7206(5); - if ($entityoverlay4 = null) { - $entityoverlay4 = _7201(5, 1, 36, 32, 1); - } else { - _104($entityoverlay4); - } - if (_202($entityoverlay4) = ^true) { - cc_setonvartransmit("script6506($entityoverlay4, $dbrow0, $loc1, $coord2, $obj3, %varbit14189, %var3548, %var3549, %var3550, %var3547, %varbit14184, %varbit14182){var3546, var3543, var3548, var3549, var3550, var3547}"); - } - if (%varbit14182 = 0 | ~cluehelper_overlay_npc_active = 1) { - highlight_loc_off($loc1, $coord2, 9, 1); - return; - } - if (%varbit14189 = 1) { - _103($entityoverlay4, ^iftype_graphic, 0); - cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); - cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); - cc_setobject_nonum($obj3, 1); - cc_setoutline(1); - } - _7010(9, ^green, 2, 30, 1); - if (%varbit14184 = 1) { - highlight_loc_on($loc1, $coord2, 9, 1); - } -} diff --git a/scripts/[proc,script6507].cs2 b/scripts/[proc,script6507].cs2 index f4b9d4d77..edf8ddac8 100644 --- a/scripts/[proc,script6507].cs2 +++ b/scripts/[proc,script6507].cs2 @@ -2,13 +2,13 @@ [proc,script6507](dbrow $dbrow0, dbrow $dbrow1, loc $loc2, coord $coord3, obj $obj4) def_entityoverlay $entityoverlay5 = null; if (loc_find($coord3, $loc2) = true) { - $entityoverlay5 = _7206(5); + $entityoverlay5 = entityoverlay_get_loc(5); if ($entityoverlay5 = null) { - $entityoverlay5 = _7201(5, 1, 60, 60, 1); + $entityoverlay5 = entityoverlay_create_loc(5, 1, 60, 60, 1); } else { - _104($entityoverlay5); + cc_deleteall_entityoverlay($entityoverlay5); } - if (_202($entityoverlay5) = ^true) { + if (if_find_entityoverlay($entityoverlay5) = ^true) { cc_setonvartransmit("script6508($entityoverlay5, $dbrow0, $dbrow1, $loc2, $coord3, $obj4, %varbit14189, %varbit14164, %varbit14184, %varbit14182){var3546, var3543, var2855}"); } if (%varbit14182 = 0) { @@ -16,20 +16,20 @@ if (loc_find($coord3, $loc2) = true) { return; } if (%varbit14189 = 1) { - _103($entityoverlay5, ^iftype_graphic, 0); + cc_create_entityoverlay($entityoverlay5, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(5, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum($obj4, 1); cc_setoutline(1); - _103($entityoverlay5, ^iftype_graphic, 1); + cc_create_entityoverlay($entityoverlay5, ^iftype_graphic, 1); cc_setsize(33, 36, ^setsize_abs, ^setsize_abs); cc_setposition(-5, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("side_icons,4"); } if (%varbit14164 = 1 & ~script6472($loc2) = 1) { - _7010(9, ^green, 2, 30, 1); + highlight_loc_setup(9, ^green, 2, 30, 1); } else { - _7010(9, ^red, 2, 30, 1); + highlight_loc_setup(9, ^red, 2, 30, 1); } if (%varbit14184 = 1) { highlight_loc_on($loc2, $coord3, 9, 1); diff --git a/scripts/[proc,script6513].cs2 b/scripts/[proc,script6513].cs2 index 75e964309..8d09aa49c 100644 --- a/scripts/[proc,script6513].cs2 +++ b/scripts/[proc,script6513].cs2 @@ -7,12 +7,12 @@ highlight_npc_on($npc_uid1, $int2, 9); if (%varbit14189 = 0) { return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(enum(int, obj, enum_4616, ~cluehelper_clue_difficulty(%var3546)), 1); cc_setoutline(1); -_103($entityoverlay0, ^iftype_graphic, 1); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 1); cc_setsize(33, 36, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("side_icons,0"); diff --git a/scripts/[proc,script6514].cs2 b/scripts/[proc,script6514].cs2 index edd758a8d..b3d31907e 100644 --- a/scripts/[proc,script6514].cs2 +++ b/scripts/[proc,script6514].cs2 @@ -7,12 +7,12 @@ highlight_npc_on($npc_uid1, $int2, 9); if (%varbit14189 = 0) { return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(enum(int, obj, enum_4616, ~cluehelper_clue_difficulty(%var3546)), 1); cc_setoutline(1); -_103($entityoverlay0, ^iftype_graphic, 1); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 1); cc_setsize(33, 36, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("side_icons,13"); diff --git a/scripts/[proc,script6515].cs2 b/scripts/[proc,script6515].cs2 index a0e06ce1a..30767f99e 100644 --- a/scripts/[proc,script6515].cs2 +++ b/scripts/[proc,script6515].cs2 @@ -7,12 +7,12 @@ highlight_npc_on($npc_uid1, $int2, 9); if (%varbit14189 = 0) { return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(enum(int, obj, enum_4616, ~cluehelper_clue_difficulty(%var3546)), 1); cc_setoutline(1); -_103($entityoverlay0, ^iftype_graphic, 1); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 1); cc_setsize(33, 36, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("side_icons,3"); diff --git a/scripts/[proc,script6516].cs2 b/scripts/[proc,script6516].cs2 index bad798c8b..4af3536a2 100644 --- a/scripts/[proc,script6516].cs2 +++ b/scripts/[proc,script6516].cs2 @@ -7,12 +7,12 @@ highlight_npc_on($npc_uid1, $int2, 9); if (%varbit14189 = 0) { return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(enum(int, obj, enum_4616, ~cluehelper_clue_difficulty(%var3546)), 1); cc_setoutline(1); -_103($entityoverlay0, ^iftype_graphic, 1); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 1); cc_setsize(33, 36, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("side_icons,1"); diff --git a/scripts/[proc,script6517].cs2 b/scripts/[proc,script6517].cs2 index a96d6d491..e8b71f9f6 100644 --- a/scripts/[proc,script6517].cs2 +++ b/scripts/[proc,script6517].cs2 @@ -7,12 +7,12 @@ highlight_npc_on($npc_uid1, $int2, 9); if (%varbit14189 = 0) { return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(enum(int, obj, enum_4616, ~cluehelper_clue_difficulty(%var3546)), 1); cc_setoutline(1); -_103($entityoverlay0, ^iftype_graphic, 1); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 1); cc_setsize(32, 32, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("options_icons,23"); diff --git a/scripts/[proc,script6533].cs2 b/scripts/[proc,script6533].cs2 index ddb339a35..9abbc7e13 100644 --- a/scripts/[proc,script6533].cs2 +++ b/scripts/[proc,script6533].cs2 @@ -13,12 +13,12 @@ highlight_npc_on($npc_uid1, $int2, 9); if (%varbit14189 = 0) { return; } -_103($entityoverlay0, ^iftype_graphic, 0); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 0); cc_setsize(36, 32, ^setsize_abs, ^setsize_abs); cc_setposition(8, 3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setobject_nonum(enum(int, obj, enum_4616, ~cluehelper_clue_difficulty(%var3546)), 1); cc_setoutline(1); -_103($entityoverlay0, ^iftype_graphic, 1); +cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, 1); cc_setsize(33, 36, ^setsize_abs, ^setsize_abs); cc_setposition(-8, -3, ^setpos_abs_centre, ^setpos_abs_centre); cc_setgraphic("side_icons,0"); diff --git a/scripts/[proc,script6542].cs2 b/scripts/[proc,script6542].cs2 index cc1b5ac89..09b3918ab 100644 --- a/scripts/[proc,script6542].cs2 +++ b/scripts/[proc,script6542].cs2 @@ -1,7 +1,7 @@ // 6542 [proc,script6542] highlight_npc_off(npc_uid, npc_spawncycle, 9); -def_entityoverlay $entityoverlay0 = _7200(3, 1, calc(36 * 2), calc(32 * 2), 1); -if (_202($entityoverlay0) = ^true) { +def_entityoverlay $entityoverlay0 = entityoverlay_create_npc(3, 1, calc(36 * 2), calc(32 * 2), 1); +if (if_find_entityoverlay($entityoverlay0) = ^true) { ~script6543($entityoverlay0, npc_spawncycle, npc_uid, npc_type); } diff --git a/scripts/[proc,script6546].cs2 b/scripts/[proc,script6546].cs2 index 1a16c4687..5c006098b 100644 --- a/scripts/[proc,script6546].cs2 +++ b/scripts/[proc,script6546].cs2 @@ -4,7 +4,7 @@ if ($entityoverlay0 = null) { return; } highlight_npc_off($npc_uid1, $int2, 9); -_104($entityoverlay0); +cc_deleteall_entityoverlay($entityoverlay0); if (~script6545($int3) ! $npc_uid1) { return; } diff --git a/scripts/[proc,script6558].cs2 b/scripts/[proc,script6558].cs2 index 88f219299..8d5206ffd 100644 --- a/scripts/[proc,script6558].cs2 +++ b/scripts/[proc,script6558].cs2 @@ -10,7 +10,7 @@ cc_create(welcome_screen:80, ^iftype_crmview, 0); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); def_string $string0 = ~script6066($int0); -cc_setcrm_url($string0); -cc_setcrm_textfont(0, b12_full); -cc_setcrm_textfont(1, p11_full); -cc_setoncrmviewload("script6560"); +cc_crmview_seturl($string0); +cc_crmview_settextfont(0, b12_full); +cc_crmview_settextfont(1, p11_full); +cc_crmview_setonupdated("script6560"); diff --git a/scripts/[proc,script6559].cs2 b/scripts/[proc,script6559].cs2 index 15f08bba8..327ab5db3 100644 --- a/scripts/[proc,script6559].cs2 +++ b/scripts/[proc,script6559].cs2 @@ -1,12 +1,12 @@ // 6559 [proc,script6559] -cc_setcrm_servertargets("welcome_screen_play_now", 1); -cc_setcrm_servertargets("welcome_screen_open_store", 2); -cc_setcrm_servertargets("welcome_screen_open_store_membership", 3); -cc_setcrm_servertargets("welcome_screen_open_store_bonds", 4); -cc_setcrm_servertargets("welcome_screen_open_poll", 5); -cc_setcrm_servertargets("welcome_screen_website_link", 6); -cc_setcrm_servertargets("welcome_screen_latest_news_link", 7); -cc_setcrm_servertargets("welcome_screen_news_archive_link", 8); -cc_setcrm_servertargets("welcome_screen_os_twitch_link", 9); -cc_setcrm_servertargets("welcome_screen_custom_event", 10); +cc_crmview_setservertargets("welcome_screen_play_now", 1); +cc_crmview_setservertargets("welcome_screen_open_store", 2); +cc_crmview_setservertargets("welcome_screen_open_store_membership", 3); +cc_crmview_setservertargets("welcome_screen_open_store_bonds", 4); +cc_crmview_setservertargets("welcome_screen_open_poll", 5); +cc_crmview_setservertargets("welcome_screen_website_link", 6); +cc_crmview_setservertargets("welcome_screen_latest_news_link", 7); +cc_crmview_setservertargets("welcome_screen_news_archive_link", 8); +cc_crmview_setservertargets("welcome_screen_os_twitch_link", 9); +cc_crmview_setservertargets("welcome_screen_custom_event", 10); diff --git a/scripts/[proc,script6664].cs2 b/scripts/[proc,script6664].cs2 index d9983edd1..50b2aa90b 100644 --- a/scripts/[proc,script6664].cs2 +++ b/scripts/[proc,script6664].cs2 @@ -2,24 +2,24 @@ [proc,script6664](npc_uid $npc_uid0, int $int1, loc $loc2, coord $coord3, obj $obj4, coord $coord5, string $string0)(int) if ($npc_uid0 ! %varcint973 | $int1 ! %varcint974) { if (npc_finduid($npc_uid0) = true) { - _7213(0); + entityoverlay_delete_player(0); } return(0); } if ($loc2 ! %varcint975 | $coord3 ! %varcint976) { if (loc_find($coord3, $loc2) = true) { - _7213(0); + entityoverlay_delete_player(0); } return(0); } if ($obj4 ! %varcint977 | $coord5 ! %varcint978) { - if (_6854($coord5, $obj4) = true) { - _7213(0); + if (obj_find($coord5, $obj4) = true) { + entityoverlay_delete_player(0); } return(0); } if (compare($string0, %varcstring979) ! 0) { - _7213(0); + entityoverlay_delete_player(0); return(0); } return(1); diff --git a/scripts/[proc,script6671].cs2 b/scripts/[proc,script6671].cs2 index 2a8e063aa..26a1768b0 100644 --- a/scripts/[proc,script6671].cs2 +++ b/scripts/[proc,script6671].cs2 @@ -1,8 +1,8 @@ // 6671 [proc,script6671] ~blast_furnace_highlights; -def_entityoverlay $entityoverlay0 = _7201(4, 0, 1, 1, 1); -if (_202($entityoverlay0) = ^true) { +def_entityoverlay $entityoverlay0 = entityoverlay_create_loc(4, 0, 1, 1, 1); +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("blast_furnace_highlights{var543}"); cc_setoninvtransmit("blast_furnace_highlights{inv, worn}"); } diff --git a/scripts/[proc,script6681].cs2 b/scripts/[proc,script6681].cs2 index 1842b7ddf..30142a949 100644 --- a/scripts/[proc,script6681].cs2 +++ b/scripts/[proc,script6681].cs2 @@ -2,9 +2,9 @@ [proc,script6681] def_int $colour0 = ~script5329(^setting_tile_highlight_colour_colour); if (%varbit12342 = 0 & ~on_enhanced_desktop = 1) { - _7035(6, $colour0, 2, 50, 90); - _6708(1, "Mark tile", 4762); + highlight_tile_setup(6, $colour0, 2, 50, 90); + shiftop_tile_set(1, "Mark tile", 4762); } else { - _7035(6, null, 0, 0, 64); - _6709(1); + highlight_tile_setup(6, null, 0, 0, 64); + shiftop_tile_del(1); } diff --git a/scripts/[proc,script6682].cs2 b/scripts/[proc,script6682].cs2 index 2953ba440..f3fcc3a8a 100644 --- a/scripts/[proc,script6682].cs2 +++ b/scripts/[proc,script6682].cs2 @@ -18,7 +18,7 @@ cc_settrans(255); cc_setposition(0, 0, ^setpos_abs_left, ^setpos_abs_top); cc_setsize(1, 1, ^setsize_abs, ^setsize_abs); cc_setonvartransmit("cluehelper_overlay_vartransmit(%var3546, %varbit14182){var3546, var3543}"); -_1433("script6495"); +cc_setonmappost("cluehelper_overlay_mappost"); if (%var3546 ! null & %varbit14182 = 1) { ~cluehelper_overlay(%var3546, ~cluehelper_clue_target(%var3546)); } diff --git a/scripts/[proc,script6687].cs2 b/scripts/[proc,script6687].cs2 index 10d62c04c..1e4373ff5 100644 --- a/scripts/[proc,script6687].cs2 +++ b/scripts/[proc,script6687].cs2 @@ -15,13 +15,13 @@ if ($int0 = 1) { $flags2 = setbit($flags2, 1); $flags2 = setbit($flags2, 3); } - _7000(6, $colour1, 2, 50, $flags2); - _7040(6, $colour1, 2, 50, $flags2); - _6700(1, "Tag", 6688); - _6700(2, "Tag-All", 6689); + highlight_npc_setup(6, $colour1, 2, 50, $flags2); + highlight_group_setup(6, $colour1, 2, 50, $flags2); + shiftop_npc_set(1, "Tag", 6688); + shiftop_npc_set(2, "Tag-All", 6689); } else { - _7000(6, null, 0, 0, 75); - _7040(6, null, 0, 0, 75); - _6701(1); - _6701(2); + highlight_npc_setup(6, null, 0, 0, 75); + highlight_group_setup(6, null, 0, 0, 75); + shiftop_npc_del(1); + shiftop_npc_del(2); } diff --git a/scripts/[proc,script6690].cs2 b/scripts/[proc,script6690].cs2 index afb8e3400..f90fa1144 100644 --- a/scripts/[proc,script6690].cs2 +++ b/scripts/[proc,script6690].cs2 @@ -1,15 +1,15 @@ // 6690 [proc,script6690](npc $npc0)(string) def_string $string0 = "2|"; -$string0 = append($string0, _6761($npc0, 1, 0)); +$string0 = append($string0, nc_minimenuname($npc0, 1, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6762($npc0, 1, 0)); +$string0 = append($string0, nc_minimenuop($npc0, 1, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6762($npc0, 2, 0)); +$string0 = append($string0, nc_minimenuop($npc0, 2, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6762($npc0, 3, 0)); +$string0 = append($string0, nc_minimenuop($npc0, 3, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6762($npc0, 4, 0)); +$string0 = append($string0, nc_minimenuop($npc0, 4, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6762($npc0, 5, 0)); +$string0 = append($string0, nc_minimenuop($npc0, 5, false)); return($string0); diff --git a/scripts/[proc,script6691].cs2 b/scripts/[proc,script6691].cs2 index ee8211e89..40916ec08 100644 --- a/scripts/[proc,script6691].cs2 +++ b/scripts/[proc,script6691].cs2 @@ -1,15 +1,15 @@ // 6691 [proc,script6691](loc $loc0)(string) def_string $string0 = "3|"; -$string0 = append($string0, _6806($loc0, 0)); +$string0 = append($string0, lc_minimenuname($loc0, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6807($loc0, 1, 0)); +$string0 = append($string0, lc_minimenuop($loc0, 1, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6807($loc0, 2, 0)); +$string0 = append($string0, lc_minimenuop($loc0, 2, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6807($loc0, 3, 0)); +$string0 = append($string0, lc_minimenuop($loc0, 3, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6807($loc0, 4, 0)); +$string0 = append($string0, lc_minimenuop($loc0, 4, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6807($loc0, 5, 0)); +$string0 = append($string0, lc_minimenuop($loc0, 5, false)); return($string0); diff --git a/scripts/[proc,script6692].cs2 b/scripts/[proc,script6692].cs2 index 7e2079d44..9bd280e71 100644 --- a/scripts/[proc,script6692].cs2 +++ b/scripts/[proc,script6692].cs2 @@ -1,15 +1,15 @@ // 6692 [proc,script6692](obj $obj0)(string) def_string $string0 = "4|"; -$string0 = append($string0, _6857($obj0, 0)); +$string0 = append($string0, oc_minimenuname($obj0, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6858($obj0, 1, 0)); +$string0 = append($string0, oc_minimenuop($obj0, 1, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6858($obj0, 2, 0)); +$string0 = append($string0, oc_minimenuop($obj0, 2, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6858($obj0, 3, 0)); +$string0 = append($string0, oc_minimenuop($obj0, 3, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6858($obj0, 4, 0)); +$string0 = append($string0, oc_minimenuop($obj0, 4, false)); $string0 = append($string0, "|"); -$string0 = append($string0, _6858($obj0, 5, 0)); +$string0 = append($string0, oc_minimenuop($obj0, 5, false)); return($string0); diff --git a/scripts/[proc,script6896].cs2 b/scripts/[proc,script6896].cs2 index 60ee571e5..a78b4f215 100644 --- a/scripts/[proc,script6896].cs2 +++ b/scripts/[proc,script6896].cs2 @@ -10,5 +10,5 @@ def_int $int3 = 1; if (lc_param($loc1, param_1545) = true) { $int3 = 2; } -def_entityoverlay $entityoverlay4 = _7201(3, $int3, 1, 1, 1); +def_entityoverlay $entityoverlay4 = entityoverlay_create_loc(3, $int3, 1, 1, 1); ~script6902($entityoverlay4, $struct0, null, -1, $loc1, $coord2); diff --git a/scripts/[proc,script6902].cs2 b/scripts/[proc,script6902].cs2 index 34ad218b4..dd76d608b 100644 --- a/scripts/[proc,script6902].cs2 +++ b/scripts/[proc,script6902].cs2 @@ -3,7 +3,7 @@ if (~on_enhanced_any = 0) { return; } -if (_202($entityoverlay0) = ^true) { +if (if_find_entityoverlay($entityoverlay0) = ^true) { cc_setonvartransmit("fishing_spot_indicator_vartransmit($entityoverlay0, $struct1, %varbit12349, %varbit12350, %varbit12351, $npc_uid2, $int3, $loc4, $coord5){var2856, var3074}"); cc_setoninvtransmit("fishing_spot_indicator_invtransmit($entityoverlay0, $struct1, $npc_uid2, $int3, $loc4, $coord5){inv, worn}"); cc_setonstattransmit("fishing_spot_indicator_stattransmit($entityoverlay0, $struct1, stat(fishing), $npc_uid2, $int3, $loc4, $coord5){fishing, agility, strength}"); diff --git a/scripts/[proc,script7034].cs2 b/scripts/[proc,script7034].cs2 index 9dd282aea..8baee3fb8 100644 --- a/scripts/[proc,script7034].cs2 +++ b/scripts/[proc,script7034].cs2 @@ -1,6 +1,6 @@ // 7034 [proc,script7034] -cc_setcrm_servertargets("membership_prompt_open_store", 1); -cc_setcrm_servertargets("membership_prompt_open_store_membership", 2); -cc_setcrm_servertargets("membership_prompt_open_store_bonds", 3); -cc_setcrm_servertargets("membership_prompt_custom_event", 4); +cc_crmview_setservertargets("membership_prompt_open_store", 1); +cc_crmview_setservertargets("membership_prompt_open_store_membership", 2); +cc_crmview_setservertargets("membership_prompt_open_store_bonds", 3); +cc_crmview_setservertargets("membership_prompt_custom_event", 4); diff --git a/scripts/[proc,script7060].cs2 b/scripts/[proc,script7060].cs2 deleted file mode 100644 index 119384dd8..000000000 --- a/scripts/[proc,script7060].cs2 +++ /dev/null @@ -1,19 +0,0 @@ -// 7060 -[proc,script7060](int $int0, int $int1, int $int2, component $component3) -if ($int0 < 0) { - $int0 = 0; -} else if ($int0 > 255) { - $int0 = 255; -} -if ($int1 < 0) { - $int1 = 0; -} else if ($int1 > 255) { - $int1 = 255; -} -if ($int2 <= 0) { - if_settrans($int1, $component3); - if_setontimer(null, $component3); - return; -} -~script7062($int0, $int1, $int2, $int2, $component3); -if_setontimer("script7061($int0, $int1, $int2, calc(clientclock + $int2), $component3)", $component3); diff --git a/scripts/[proc,script7070].cs2 b/scripts/[proc,script7070].cs2 deleted file mode 100644 index 62824b1d5..000000000 --- a/scripts/[proc,script7070].cs2 +++ /dev/null @@ -1,7 +0,0 @@ -// 7070 -[proc,script7070](component $component0, component $component1, component $component2, component $component3, component $component4, component $component5, component $component6) -~script7072($component1, $component6); -~script7071($component1, $component5); -~script7074($component2); -~script7077($component3); -~script7068($component4, 0); diff --git a/scripts/[proc,script7074].cs2 b/scripts/[proc,script7074].cs2 index 70dd5debc..b0577c48d 100644 --- a/scripts/[proc,script7074].cs2 +++ b/scripts/[proc,script7074].cs2 @@ -12,7 +12,7 @@ cc_setmodelanim(seq_10057); cc_setmodelangle(0, 0, 0, %varcint1150, 0, 1000); cc_setsize(5, 5, ^setsize_minus, ^setsize_minus); cc_setposition(0, 15, ^setpos_abs_centre, ^setpos_abs_top); -cc_setontimer("script7075(event_com, event_comsubid)"); +cc_setontimer("makeover_spin(event_com, event_comsubid)"); cc_setop(1, "Toggle"); cc_setopbase("Spin"); cc_setonop("script7076"); diff --git a/scripts/[proc,script7083].cs2 b/scripts/[proc,script7083].cs2 index 1262ff32f..680426332 100644 --- a/scripts/[proc,script7083].cs2 +++ b/scripts/[proc,script7083].cs2 @@ -3,4 +3,4 @@ cc_deleteall($component0); cc_deleteall($component1); ~script7085($component0, 0, $component1, $component2); -~script7084($component0, $component1, $component2, 0, $int3); +~makeover_create_dropdown($component0, $component1, $component2, 0, $int3); diff --git a/scripts/[proc,script7106].cs2 b/scripts/[proc,script7106].cs2 index 4a07f74d6..44da12b5a 100644 --- a/scripts/[proc,script7106].cs2 +++ b/scripts/[proc,script7106].cs2 @@ -4,7 +4,7 @@ def_int $int1 = 0; def_int $int2 = 0; switch_int ($setting0) { case 318 : - $int1, $int2 = _3217(20); + $int1, $int2 = deviceoption_getrange(20); switch_int ($int2) { case 0 : return(null); diff --git a/scripts/[proc,script7133].cs2 b/scripts/[proc,script7133].cs2 index 6a8ff6ba1..263fb69d9 100644 --- a/scripts/[proc,script7133].cs2 +++ b/scripts/[proc,script7133].cs2 @@ -94,7 +94,7 @@ while ($int7 < 10) { while ($int8 < $int12) { if (cc_find($component0, $int8) = ^true) { $obj15, $int16, $int17, $int19, $int18, $int20 = ~script7173($component0, $int8); - $int22 = _7408(stringvector_2, oc_name($obj15), 1, 0); + $int22 = stringvector_contains(stringvector_2, oc_name($obj15), true, false); if ($int22 = 0 | %varbit14880 = 1) { if ($int13 = 1) { if ($int26 = 0 & $int25 ! 0) { diff --git a/scripts/[proc,script7160].cs2 b/scripts/[proc,script7160].cs2 index f0bf76cb8..4ac862869 100644 --- a/scripts/[proc,script7160].cs2 +++ b/scripts/[proc,script7160].cs2 @@ -1,10 +1,10 @@ // 7160 [proc,script7160](string $string0) -def_int $width0 = _7603($string0); +def_int $width0 = loottracker_sourceid($string0); if ($width0 <= 0) { return; } -def_int $height1 = _7604($string0); +def_int $height1 = loottracker_sourcecount($string0); if ($height1 <= 0) { return; } diff --git a/scripts/[proc,script7164].cs2 b/scripts/[proc,script7164].cs2 index 67320fcf6..fb50ea587 100644 --- a/scripts/[proc,script7164].cs2 +++ b/scripts/[proc,script7164].cs2 @@ -4,9 +4,9 @@ def_int $colour4 = if_getcolour($component0); def_int $colour5 = ^black; def_int $colour6 = ^black; def_int $int7 = 0; -$colour5, $colour6, $int7 = ~script7178($obj2); +$colour5, $colour6, $int7 = ~loottracker_value_item($obj2); if_setcolour(calc($colour4 + 1), $component0); cc_create($component0, ^iftype_rectangle, $colour4); cc_setobject($obj2, $num3); cc_setcolour($colour5); -cc_setfillcolour($colour6); +cc_setgradientcolour($colour6); diff --git a/scripts/[proc,script7166].cs2 b/scripts/[proc,script7166].cs2 index d2b132305..db3859172 100644 --- a/scripts/[proc,script7166].cs2 +++ b/scripts/[proc,script7166].cs2 @@ -1,19 +1,19 @@ // 7166 [proc,script7166] -def_int $int0 = _7601; +def_int $int0 = loottracker_sourcenamecount; def_component $component1 = null; def_int $int2 = 0; def_int $int3 = -1; def_string $string0 = "null"; def_int $height4 = 0; ~script7170; -def_int $int5 = _7605(0, ~min($int0, 10), 1); +def_int $int5 = loottracker_sourcequery_new(0, ~min($int0, 10), 1); $int2 = 0; while ($int2 < $int5) { $component1 = ~script7168($int2); - $int3 = _7606($int2); - $string0 = _7602($int3); - $height4 = _7604($string0); + $int3 = loottracker_sourcequery_get($int2); + $string0 = loottracker_sourcename($int3); + $height4 = loottracker_sourcecount($string0); if ($height4 > 0) { ~script7172($component1, $string0, $int3, $height4); } diff --git a/scripts/[proc,script7170].cs2 b/scripts/[proc,script7170].cs2 index cc3cfe91e..32dd822d1 100644 --- a/scripts/[proc,script7170].cs2 +++ b/scripts/[proc,script7170].cs2 @@ -41,13 +41,13 @@ if_setcolour(^black, interface_650:9); if_setcolour(^black, interface_650:10); if_setcolour(^black, interface_650:11); if_setcolour(^black, interface_650:12); -if_setfillcolour(^black, interface_650:3); -if_setfillcolour(^black, interface_650:4); -if_setfillcolour(^black, interface_650:5); -if_setfillcolour(^black, interface_650:6); -if_setfillcolour(^black, interface_650:7); -if_setfillcolour(^black, interface_650:8); -if_setfillcolour(^black, interface_650:9); -if_setfillcolour(^black, interface_650:10); -if_setfillcolour(^black, interface_650:11); -if_setfillcolour(^black, interface_650:12); +if_setgradientcolour(^black, interface_650:3); +if_setgradientcolour(^black, interface_650:4); +if_setgradientcolour(^black, interface_650:5); +if_setgradientcolour(^black, interface_650:6); +if_setgradientcolour(^black, interface_650:7); +if_setgradientcolour(^black, interface_650:8); +if_setgradientcolour(^black, interface_650:9); +if_setgradientcolour(^black, interface_650:10); +if_setgradientcolour(^black, interface_650:11); +if_setgradientcolour(^black, interface_650:12); diff --git a/scripts/[proc,script7171].cs2 b/scripts/[proc,script7171].cs2 index 55c7d36c9..12f48dcb2 100644 --- a/scripts/[proc,script7171].cs2 +++ b/scripts/[proc,script7171].cs2 @@ -4,7 +4,7 @@ cc_deleteall($component1); if_settext(if_gettext($component0), $component1); if_setscrollsize(if_getscrollwidth($component0), if_getscrollheight($component0), $component1); if_setcolour(if_getcolour($component0), $component1); -if_setfillcolour(if_getfillcolour($component0), $component1); +if_setgradientcolour(if_getfillcolour($component0), $component1); def_int $int2 = 0; def_obj $obj3 = null; def_int $num4 = 0; @@ -18,6 +18,6 @@ while (cc_find($component0, $int2) = ^true) { cc_create($component1, ^iftype_rectangle, $int2); cc_setobject($obj3, $num4); cc_setcolour($colour5); - cc_setfillcolour($colour6); + cc_setgradientcolour($colour6); $int2 = calc($int2 + 1); } diff --git a/scripts/[proc,script7172].cs2 b/scripts/[proc,script7172].cs2 index 3520b6e61..cd38944cf 100644 --- a/scripts/[proc,script7172].cs2 +++ b/scripts/[proc,script7172].cs2 @@ -8,21 +8,21 @@ def_int $num7 = 0; def_int $colour8 = ^black; def_int $colour9 = ^black; def_int $int10 = 0; -def_int $int11 = _7619; +def_int $int11 = loottracker_ignorelootcount; def_string $string1 = "null"; cc_deleteall($component0); if_settext($string0, $component0); if_setscrollsize($width1, $height2, $component0); -$colour4 = _7609($string0); +$colour4 = loottracker_lootcount_byname($string0); if_setcolour($colour4, $component0); -if_setfillcolour(0x000001, $component0); +if_setgradientcolour(0x000001, $component0); while ($colour5 <= $colour4) { - $obj6, $num7 = _7611($string0, calc($colour5 + 1)); - $colour8, $colour9, $int10 = ~script7178($obj6); + $obj6, $num7 = loottracker_lootget_byname($string0, calc($colour5 + 1)); + $colour8, $colour9, $int10 = ~loottracker_value_item($obj6); cc_create($component0, ^iftype_rectangle, $int3); $int3 = calc($int3 + 1); cc_setobject($obj6, $num7); cc_setcolour($colour8); - cc_setfillcolour($colour9); + cc_setgradientcolour($colour9); $colour5 = calc($colour5 + 1); } diff --git a/scripts/[proc,script7199].cs2 b/scripts/[proc,script7199].cs2 index 40178a35d..ae10c0c2e 100644 --- a/scripts/[proc,script7199].cs2 +++ b/scripts/[proc,script7199].cs2 @@ -1,10 +1,10 @@ // 7199 [proc,script7199](component $component0, int $int1, obj $obj2) def_string $string0 = oc_name($obj2); -if (_7408(stringvector_2, $string0, 0, 0) = 0) { - _7616($string0); - _7401(stringvector_2, $string0, 0); +if (stringvector_contains(stringvector_2, $string0, false, false) = 0) { + loottracker_ignorelootadd($string0); + stringvector_addunique(stringvector_2, $string0, false); } else { - _7617($string0); - _7404(stringvector_2, $string0, 0); + loottracker_ignorelootdel($string0); + stringvector_remove(stringvector_2, $string0, false); } diff --git a/scripts/[proc,script7200].cs2 b/scripts/[proc,script7200].cs2 index 302ad8210..91d4a604e 100644 --- a/scripts/[proc,script7200].cs2 +++ b/scripts/[proc,script7200].cs2 @@ -1,12 +1,12 @@ // 7200 [proc,script7200] def_int $int0 = 1; -def_int $int1 = _7619; +def_int $int1 = loottracker_ignorelootcount; def_string $string0 = "null"; -_7409(stringvector_2); +stringvector_clear(stringvector_2); while ($int0 <= $int1) { - $string0 = _7620($int0); - _7401(stringvector_2, $string0, 0); + $string0 = loottracker_ignorelootget($int0); + stringvector_addunique(stringvector_2, $string0, false); $int0 = calc($int0 + 1); } if ($int0 > 0) { diff --git a/scripts/[proc,script7202].cs2 b/scripts/[proc,script7202].cs2 index ce5680b0e..6990fdbac 100644 --- a/scripts/[proc,script7202].cs2 +++ b/scripts/[proc,script7202].cs2 @@ -1,16 +1,16 @@ // 7202 [proc,script7202](int $length0)(string) def_string $string0 = ""; -def_int $int1 = _7407(stringvector_2); +def_int $int1 = stringvector_size(stringvector_2); if ($int1 < 1) { return($string0); } def_int $int2 = 0; while ($int2 < $int1) { if ($int2 = 0) { - $string0 = _7406(stringvector_2, $int2); + $string0 = stringvector_get(stringvector_2, $int2); } else { - $string0 = "<$string0>, <_7406(stringvector_2, $int2)>"; + $string0 = "<$string0>, "; } $int2 = calc($int2 + 1); } diff --git a/scripts/[proc,script7203].cs2 b/scripts/[proc,script7203].cs2 index 656cc0cb5..105e1a4c2 100644 --- a/scripts/[proc,script7203].cs2 +++ b/scripts/[proc,script7203].cs2 @@ -2,8 +2,8 @@ [proc,script7203](string $string0) def_string $string1 = "null"; def_int $index0 = 0; -_7621; -_7409(stringvector_2); +loottracker_ignorelootclear; +stringvector_clear(stringvector_2); $string0 = lowercase($string0); $string0 = ~script7123($string0); def_int $index1 = string_indexof_string($string0, ",", 0); @@ -12,8 +12,8 @@ while ($index1 ! -1 & $int2 < 50) { $string1 = substring($string0, $index0, $index1); $string1 = ~string_trim($string1); if (string_length($string1) > 0) { - _7616($string1); - _7401(stringvector_2, $string1, 0); + loottracker_ignorelootadd($string1); + stringvector_addunique(stringvector_2, $string1, false); } $index0 = calc($index1 + 1); $index1 = string_indexof_string($string0, ",", $index0); @@ -22,10 +22,10 @@ while ($index1 ! -1 & $int2 < 50) { $string1 = substring($string0, $index0, string_length($string0)); $string1 = ~string_trim($string1); if (string_length($string1) > 0) { - _7616($string1); - _7401(stringvector_2, $string1, 0); + loottracker_ignorelootadd($string1); + stringvector_addunique(stringvector_2, $string1, false); } -if (_7407(stringvector_2) > 0) { +if (stringvector_size(stringvector_2) > 0) { %varbit14882 = 1; } else { %varbit14882 = 0; diff --git a/scripts/[proc,script7210].cs2 b/scripts/[proc,script7210].cs2 index 3818501c7..f0dee8353 100644 --- a/scripts/[proc,script7210].cs2 +++ b/scripts/[proc,script7210].cs2 @@ -19,7 +19,7 @@ if ($setsize5 = ^setsize_abs) { $int3 = calc($int3 + 4); } cc_setsize($int2, $int3, $setsize4, $setsize5); -cc_setinput_width(calc(cc_getwidth - 2)); +cc_input_setwidth(calc(cc_getwidth - 2)); if ($setposh8 ! ^setpos_abs_centre & $setposh8 < ^setpos_3) { $int6 = calc($int6 + 5); } @@ -31,8 +31,8 @@ cc_settextfont(p12_full); cc_setcolour(^white); cc_settextshadow(true); cc_settextalign(^settextalign_left, ^settextalign_top, 0); -cc_setinput_submitmode(1); -cc_setinput_wrapmode(1); -cc_setinput_selectcolour(^black); -cc_setinput_selectbgcolour(^white); +cc_input_setsubmitmode(1); +cc_input_setwrapmode(1); +cc_input_setselectcolour(^black); +cc_input_setselectbgcolour(^white); return($int1); diff --git a/scripts/[proc,script7212].cs2 b/scripts/[proc,script7212].cs2 index 13021834c..d5c4dfee4 100644 --- a/scripts/[proc,script7212].cs2 +++ b/scripts/[proc,script7212].cs2 @@ -1,10 +1,10 @@ // 7212 [proc,script7212](stringvector $stringvector0)(string) def_int $int1 = 0; -def_int $int2 = _7407($stringvector0); +def_int $int2 = stringvector_size($stringvector0); def_string $string0 = ""; while ($int1 < $int2) { - $string0 = "<$string0><_7406($stringvector0, $int1)>,"; + $string0 = "<$string0>,"; $int1 = calc($int1 + 1); } if ($int2 > 0) { diff --git a/scripts/[proc,script7213].cs2 b/scripts/[proc,script7213].cs2 index 9458e46c4..dcd1720e8 100644 --- a/scripts/[proc,script7213].cs2 +++ b/scripts/[proc,script7213].cs2 @@ -4,5 +4,5 @@ cc_deleteall($component0); def_int $int2 = ~thinbox($component0, $int2); ~script7210($component0, $int2, 4, 4, ^setsize_minus, ^setsize_minus, 0, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_settext(~script7212($stringvector1)); -cc_setoninputsubmit("script7214"); -cc_setoninputfocus("script7215(event_com, event_comsubid, $stringvector1)"); +cc_input_setonsubmit("ground_items_confirm"); +cc_input_setonfocuschange("ground_items_focus_changed(event_com, event_comsubid, $stringvector1)"); diff --git a/scripts/[proc,script7218].cs2 b/scripts/[proc,script7218].cs2 index d1eb6c0e0..4071b32b5 100644 --- a/scripts/[proc,script7218].cs2 +++ b/scripts/[proc,script7218].cs2 @@ -2,7 +2,7 @@ [proc,script7218](string $string0, stringvector $stringvector0) def_string $string1 = "null"; def_int $index1 = 0; -_7409($stringvector0); +stringvector_clear($stringvector0); $string0 = ~script7123($string0); def_int $index2 = string_indexof_string($string0, ",", 0); def_int $int3 = 0; diff --git a/scripts/[proc,script7219].cs2 b/scripts/[proc,script7219].cs2 index b130fb4f9..627ba387c 100644 --- a/scripts/[proc,script7219].cs2 +++ b/scripts/[proc,script7219].cs2 @@ -2,5 +2,5 @@ [proc,script7219](int $int0, stringvector $stringvector1) mes("You are trying to add too many entries to this list. Please consider cutting your list down if you would like to add any more to it."); if ($int0 = 1 & $stringvector1 ! null) { - mes("Any entries after <_7406($stringvector1, calc(_7407($stringvector1) - 1))> will be ignored."); + mes("Any entries after will be ignored."); } diff --git a/scripts/[proc,script7221].cs2 b/scripts/[proc,script7221].cs2 index 095e1104f..f04915159 100644 --- a/scripts/[proc,script7221].cs2 +++ b/scripts/[proc,script7221].cs2 @@ -1,11 +1,11 @@ // 7221 [proc,script7221](stringvector $stringvector0, string $string0, int $int1) -if (_7407($stringvector0) > 500) { +if (stringvector_size($stringvector0) > 500) { ~script7219(0, $stringvector0); return; } -_7401($stringvector0, $string0, 0); +stringvector_addunique($stringvector0, $string0, false); %varcint1154 = calc(clientclock + 1); if ($int1 = 1) { - ~script7206; + ~ground_items_build; } diff --git a/scripts/[proc,script7222].cs2 b/scripts/[proc,script7222].cs2 index 3a71a1a5f..7fdedd0e5 100644 --- a/scripts/[proc,script7222].cs2 +++ b/scripts/[proc,script7222].cs2 @@ -1,7 +1,7 @@ // 7222 [proc,script7222](stringvector $stringvector0, string $string0, int $int1) -_7404($stringvector0, $string0, 0); +stringvector_remove($stringvector0, $string0, false); %varcint1154 = calc(clientclock + 1); if ($int1 = 1) { - ~script7206; + ~ground_items_build; } diff --git a/scripts/[proc,script7225].cs2 b/scripts/[proc,script7225].cs2 index b6f65c49f..76b3e2d2f 100644 --- a/scripts/[proc,script7225].cs2 +++ b/scripts/[proc,script7225].cs2 @@ -1,6 +1,6 @@ // 7225 -[proc,script7225](stringvector $stringvector0, obj $obj1, int $int2)(int) -if (_7408($stringvector0, removetags(oc_name($obj1)), $int2, 0) = 1) { +[proc,script7225](stringvector $stringvector0, obj $obj1, boolean $boolean2)(int) +if (stringvector_contains($stringvector0, removetags(oc_name($obj1)), $boolean2, false) = 1) { return(1); } return(0); diff --git a/scripts/[proc,script7232].cs2 b/scripts/[proc,script7232].cs2 index 9c4b4956e..b7b2feac8 100644 --- a/scripts/[proc,script7232].cs2 +++ b/scripts/[proc,script7232].cs2 @@ -1,7 +1,7 @@ // 7232 [proc,script7232](entityoverlay $entityoverlay0, coord $coord1, int $int2, int $int3, int $int4, obj $obj5, int $int6, int $int7, int $colour8, int $int9, int $int10, boolean $boolean11, boolean $boolean12)(int) def_int $y13 = calc(($int4 - $int2 - 1) * 17); -_103($entityoverlay0, ^iftype_text, $int3); +cc_create_entityoverlay($entityoverlay0, ^iftype_text, $int3); $int3 = calc($int3 + 1); cc_setsize(108, 17, ^setsize_minus, ^setsize_abs); cc_setposition(0, $y13, ^setpos_abs_centre, ^setpos_abs_bottom); @@ -26,11 +26,11 @@ def_int $width14 = parawidth($string0, 300, p12_full); def_graphic $graphic15 = null; def_graphic $graphic16 = null; if ($int10 = 1) { - _103($entityoverlay0, ^iftype_graphic, $int3); + cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, $int3); $int3 = calc($int3 + 1); - _103($entityoverlay0, ^iftype_graphic, $int3); + cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, $int3); $int3 = calc($int3 + 1); - if (~script7225(stringvector_4, $obj5, 1) = 1) { + if (~script7225(stringvector_4, $obj5, true) = 1) { $graphic15 = "graphic_4905"; $graphic16 = "graphic_4906"; $string0 = "Unhighlight "; @@ -42,12 +42,12 @@ if ($int10 = 1) { .cc_setsize(17, 17, ^setsize_abs, ^setsize_abs); .cc_setgraphic($graphic15); .cc_setposition(calc($width14 / 2 + 27), $y13, ^setpos_abs_centre, ^setpos_abs_bottom); - .cc_setonmouserepeat("script7121($entityoverlay0, calc($int3 - 2), $graphic16, null)"); - .cc_setonmouseleave("script7121($entityoverlay0, calc($int3 - 2), $graphic15, null)"); + .cc_setonmouserepeat("cc_graphic_swapper_entityoverlay($entityoverlay0, calc($int3 - 2), $graphic16, null)"); + .cc_setonmouseleave("cc_graphic_swapper_entityoverlay($entityoverlay0, calc($int3 - 2), $graphic15, null)"); .cc_setnoclickthrough(true); .cc_setop(1, $string0); - .cc_setonop("script7233($obj5)"); - if (~script7225(stringvector_3, $obj5, 1) = 1) { + .cc_setonop("ground_items_highlight($obj5)"); + if (~script7225(stringvector_3, $obj5, true) = 1) { $graphic15 = "graphic_4907"; $graphic16 = "graphic_4908"; $string0 = "Unignore "; @@ -59,16 +59,16 @@ if ($int10 = 1) { cc_setsize(17, 17, ^setsize_abs, ^setsize_abs); cc_setgraphic($graphic15); cc_setposition(calc($width14 / 2 + 10), $y13, ^setpos_abs_centre, ^setpos_abs_bottom); - cc_setonmouserepeat("script7121($entityoverlay0, calc($int3 - 1), $graphic16, null)"); - cc_setonmouseleave("script7121($entityoverlay0, calc($int3 - 1), $graphic15, null)"); + cc_setonmouserepeat("cc_graphic_swapper_entityoverlay($entityoverlay0, calc($int3 - 1), $graphic16, null)"); + cc_setonmouseleave("cc_graphic_swapper_entityoverlay($entityoverlay0, calc($int3 - 1), $graphic15, null)"); cc_setnoclickthrough(true); cc_setop(1, $string0); - cc_setonop("script7234($obj5)"); + cc_setonop("ground_items_filter($obj5)"); } def_int $int17 = 0; def_int $int18 = 0; def_int $int19 = 0; -if (_6859($coord1, $int9) = true) { +if (obj_findbyindex($coord1, $int9) = true) { if ($boolean11 = true) { $int17 = calc(30 * obj_despawntime); } @@ -76,7 +76,7 @@ if (_6859($coord1, $int9) = true) { $int18 = calc(30 * obj_revealtime); } if ($int17 > 0 | $int18 > 0 | $boolean12 = true) { - _103($entityoverlay0, ^iftype_text, $int3); + cc_create_entityoverlay($entityoverlay0, ^iftype_text, $int3); cc_setsize(34, 17, ^setsize_abs, ^setsize_abs); $int19 = calc(0 - $width14 / 2 - 34 / 2); cc_setposition($int19, $y13, ^setpos_abs_centre, ^setpos_abs_bottom); @@ -84,7 +84,7 @@ if (_6859($coord1, $int9) = true) { cc_settextshadow(true); cc_settextalign(^settextalign_centre, ^settextalign_centre, 0); $int3 = calc($int3 + 1); - _103($entityoverlay0, ^iftype_graphic, $int3); + cc_create_entityoverlay($entityoverlay0, ^iftype_graphic, $int3); .cc_setsize(17, 17, ^setsize_abs, ^setsize_abs); .cc_setposition(calc($int19 - 34 / 2 - 10), $y13, ^setpos_abs_centre, ^setpos_abs_bottom); $int3 = calc($int3 + 1); diff --git a/scripts/[proc,script7238].cs2 b/scripts/[proc,script7238].cs2 deleted file mode 100644 index 905448845..000000000 --- a/scripts/[proc,script7238].cs2 +++ /dev/null @@ -1,7 +0,0 @@ -// 7238 -[proc,script7238](obj $obj0)(int) -def_string $string0 = removetags(oc_name($obj0)); -if (_7408(stringvector_4, $string0, 1, 0) = 1) { - return(1); -} -return(0); diff --git a/scripts/[proc,script7239].cs2 b/scripts/[proc,script7239].cs2 deleted file mode 100644 index 7ad943e02..000000000 --- a/scripts/[proc,script7239].cs2 +++ /dev/null @@ -1,7 +0,0 @@ -// 7239 -[proc,script7239](obj $obj0)(boolean) -def_string $string0 = removetags(oc_name($obj0)); -if (_7408(stringvector_3, $string0, 1, 0) = 1) { - return(false); -} -return(true); diff --git a/scripts/[proc,script7241].cs2 b/scripts/[proc,script7241].cs2 index def0d1a0f..68cc08774 100644 --- a/scripts/[proc,script7241].cs2 +++ b/scripts/[proc,script7241].cs2 @@ -10,7 +10,7 @@ if ($int0 = 0) { if ($int0 = 1) { return(1); } -if (_3501(%varbit14877) = true | keyheld(%varbit14877) = true) { +if (keypressed(%varbit14877) = true | keyheld(%varbit14877) = true) { return(1); } return(0); diff --git a/scripts/[proc,script7242].cs2 b/scripts/[proc,script7242].cs2 index 723a86ae8..39ae7ae64 100644 --- a/scripts/[proc,script7242].cs2 +++ b/scripts/[proc,script7242].cs2 @@ -10,7 +10,7 @@ if ($int0 = 0) { if ($int0 = 1) { return(true); } -if (_3501(%varbit14877) = true | keyheld(%varbit14877) = true) { +if (keypressed(%varbit14877) = true | keyheld(%varbit14877) = true) { return(true); } return(false); diff --git a/scripts/[proc,script7243].cs2 b/scripts/[proc,script7243].cs2 index 9adc356a7..b9d14a826 100644 --- a/scripts/[proc,script7243].cs2 +++ b/scripts/[proc,script7243].cs2 @@ -10,7 +10,7 @@ if ($int0 = 0) { if ($int0 = 1) { return(true); } -if (_3501(%varbit14877) = true | keyheld(%varbit14877) = true) { +if (keypressed(%varbit14877) = true | keyheld(%varbit14877) = true) { return(true); } return(false); diff --git a/scripts/[proc,settings_clicked_toggle].cs2 b/scripts/[proc,settings_clicked_toggle].cs2 index 275943e4d..8090e1153 100644 --- a/scripts/[proc,settings_clicked_toggle].cs2 +++ b/scripts/[proc,settings_clicked_toggle].cs2 @@ -425,7 +425,7 @@ switch_int ($setting0) { case 320 : ~script7110; case 321 : - ~script7112; + ~settings_ground_items; case 333 : ~script7113; case 335 : diff --git a/scripts/[proc,settings_custom_check].cs2 b/scripts/[proc,settings_custom_check].cs2 index bb984b024..5daea9f0d 100644 --- a/scripts/[proc,settings_custom_check].cs2 +++ b/scripts/[proc,settings_custom_check].cs2 @@ -6,7 +6,7 @@ def_int $int3 = 0; switch_int ($setting0) { case 53 : $int1 = scale(600, 16384, if_getwidth(if_getlayer(toplevel_osm:19))); - if ($int1 <= viewport_getx & $int1 <= viewport_getwidth) { + if ($int1 <= safearea_getminx & $int1 <= safearea_getmaxx) { return(0); } return(1); diff --git a/scripts/[proc,script7112].cs2 b/scripts/[proc,settings_ground_items].cs2 similarity index 74% rename from scripts/[proc,script7112].cs2 rename to scripts/[proc,settings_ground_items].cs2 index 599024b22..f93082e56 100644 --- a/scripts/[proc,script7112].cs2 +++ b/scripts/[proc,settings_ground_items].cs2 @@ -1,5 +1,5 @@ // 7112 -[proc,script7112] +[proc,settings_ground_items] if (~on_enhanced_any = 0) { return; } diff --git a/scripts/[proc,settings_logout_notifier].cs2 b/scripts/[proc,settings_logout_notifier].cs2 index c5fccac32..d21259a40 100644 --- a/scripts/[proc,settings_logout_notifier].cs2 +++ b/scripts/[proc,settings_logout_notifier].cs2 @@ -3,5 +3,5 @@ if (~on_enhanced_any = 0) { return; } -_3329; +idletimer_reset; %varbit13083 = calc(1 - %varbit13083); diff --git a/scripts/[proc,settings_slider_choose_onop].cs2 b/scripts/[proc,settings_slider_choose_onop].cs2 index 3287b855f..4d1c8869b 100644 --- a/scripts/[proc,settings_slider_choose_onop].cs2 +++ b/scripts/[proc,settings_slider_choose_onop].cs2 @@ -6,6 +6,6 @@ switch_int ($setting0) { case 53 : cc_setonclick("script3890($component1, $comsubid2, event_mousex, $int3, $y4, $int5, $component7)"); case 310 : - cc_setonclick("script7025($component1, $comsubid2, $int10, $int3, $y4, $int5, $int6, $component7, $int9)"); + cc_setonclick("settings_minimap_zoom_op($component1, $comsubid2, $int10, $int3, $y4, $int5, $int6, $component7, $int9)"); cc_setontimer("settings_minimap_zoom_position_timer(minimap_zoom, $component1, $comsubid2, $int3, $y4, $int5, $int6, $int9)"); } diff --git a/scripts/[proc,steam_set_stat_progress].cs2 b/scripts/[proc,steam_set_stat_progress].cs2 index 0a5a62179..15336cd90 100644 --- a/scripts/[proc,steam_set_stat_progress].cs2 +++ b/scripts/[proc,steam_set_stat_progress].cs2 @@ -13,5 +13,5 @@ def_string $string0 = enum_string(enum_1373, $int0); if (compare($string0, "") = 0) { return(0); } -def_int $int3 = _3701($string0, $int1, $int2); +def_int $int3 = steam_setstat($string0, $int1, $int2); return($int3); diff --git a/scripts/[proc,steam_set_unlocked].cs2 b/scripts/[proc,steam_set_unlocked].cs2 index cf763929b..b3493b17c 100644 --- a/scripts/[proc,steam_set_unlocked].cs2 +++ b/scripts/[proc,steam_set_unlocked].cs2 @@ -10,5 +10,5 @@ def_string $string0 = enum_string(enum_1373, $int0); if (compare($string0, "") = 0) { return(0); } -def_int $int2 = _3700($string0, 1, $int1); +def_int $int2 = steam_setachivement($string0, 1, $int1); return($int2); diff --git a/scripts/[proc,test_setup_highlights].cs2 b/scripts/[proc,test_setup_highlights].cs2 index 524209d8c..133ad0815 100644 --- a/scripts/[proc,test_setup_highlights].cs2 +++ b/scripts/[proc,test_setup_highlights].cs2 @@ -8,50 +8,50 @@ def_int $int4 = 16; def_int $int5 = 25; def_int $int6 = 32; def_int $int7 = 128; -_7000(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); -_7005(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); -_7010(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); -_7015(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); -_7020(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); -_7025(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); -_7030(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); -_7035(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); -_7000(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); -_7005(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); -_7010(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); -_7015(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); -_7020(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); -_7025(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); -_7030(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); -_7035(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); -_7000(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); -_7005(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); -_7010(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); -_7015(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); -_7020(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); -_7025(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); -_7030(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); -_7035(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); -_6700(1, "Highlight normal", 4625); -_6700(2, "Highlight always-on-top", 4626); -_6700(3, "Highlight snap-to-grid", 4627); -_6700(4, "Highlight-all normal", 4628); -_6700(5, "Highlight-all always-on-top", 4629); -_6700(6, "Highlight-all snap-to-grid", 4630); -_6702(1, "Highlight normal", 4631); -_6702(2, "Highlight always-on-top", 4632); -_6702(3, "Highlight snap-to-grid", 4633); -_6702(4, "Highlight-all normal", 4634); -_6702(5, "Highlight-all always-on-top", 4635); -_6702(6, "Highlight-all snap-to-grid", 4636); -_6704(1, "Highlight normal", 4637); -_6704(2, "Highlight always-on-top", 4638); -_6704(3, "Highlight snap-to-grid", 4639); -_6704(4, "Highlight-all normal", 4640); -_6704(5, "Highlight-all always-on-top", 4641); -_6704(6, "Highlight-all snap-to-grid", 4642); -_6706(1, "Highlight normal", 4643); -_6706(2, "Highlight always-on-top", 4644); -_6706(3, "Highlight snap-to-grid", 4645); -_6708(1, "Highlight normal", 4646); -_6708(2, "Highlight always-on-top", 4647); +highlight_npc_setup(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); +highlight_npctype_setup(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); +highlight_loc_setup(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); +highlight_loctype_setup(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); +highlight_obj_setup(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); +highlight_objtype_setup(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); +highlight_player_setup(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); +highlight_tile_setup(1, ^red, 2, 100, calc($int0 + $int2 + $int1 + $int3)); +highlight_npc_setup(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); +highlight_npctype_setup(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); +highlight_loc_setup(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); +highlight_loctype_setup(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); +highlight_obj_setup(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); +highlight_objtype_setup(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); +highlight_player_setup(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); +highlight_tile_setup(2, ^magenta, 2, 100, calc($int0 + $int2 + $int1 + $int3 + $int4)); +highlight_npc_setup(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); +highlight_npctype_setup(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); +highlight_loc_setup(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); +highlight_loctype_setup(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); +highlight_obj_setup(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); +highlight_objtype_setup(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); +highlight_player_setup(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); +highlight_tile_setup(3, ^yellow, 2, 100, calc($int1 + $int3 + $int4 + $int6 + $int7)); +shiftop_npc_set(1, "Highlight normal", 4625); +shiftop_npc_set(2, "Highlight always-on-top", 4626); +shiftop_npc_set(3, "Highlight snap-to-grid", 4627); +shiftop_npc_set(4, "Highlight-all normal", 4628); +shiftop_npc_set(5, "Highlight-all always-on-top", 4629); +shiftop_npc_set(6, "Highlight-all snap-to-grid", 4630); +shiftop_loc_set(1, "Highlight normal", 4631); +shiftop_loc_set(2, "Highlight always-on-top", 4632); +shiftop_loc_set(3, "Highlight snap-to-grid", 4633); +shiftop_loc_set(4, "Highlight-all normal", 4634); +shiftop_loc_set(5, "Highlight-all always-on-top", 4635); +shiftop_loc_set(6, "Highlight-all snap-to-grid", 4636); +shiftop_obj_set(1, "Highlight normal", 4637); +shiftop_obj_set(2, "Highlight always-on-top", 4638); +shiftop_obj_set(3, "Highlight snap-to-grid", 4639); +shiftop_obj_set(4, "Highlight-all normal", 4640); +shiftop_obj_set(5, "Highlight-all always-on-top", 4641); +shiftop_obj_set(6, "Highlight-all snap-to-grid", 4642); +shiftop_player_set(1, "Highlight normal", 4643); +shiftop_player_set(2, "Highlight always-on-top", 4644); +shiftop_player_set(3, "Highlight snap-to-grid", 4645); +shiftop_tile_set(1, "Highlight normal", 4646); +shiftop_tile_set(2, "Highlight always-on-top", 4647); diff --git a/scripts/[proc,thinbox_entityoverlay].cs2 b/scripts/[proc,thinbox_entityoverlay].cs2 index abc1bb009..af303f86a 100644 --- a/scripts/[proc,thinbox_entityoverlay].cs2 +++ b/scripts/[proc,thinbox_entityoverlay].cs2 @@ -1,12 +1,12 @@ // 4650 [proc,thinbox_entityoverlay](entityoverlay $entityoverlay0, int $int1)(int) -_103($entityoverlay0, ^iftype_rectangle, $int1); +cc_create_entityoverlay($entityoverlay0, ^iftype_rectangle, $int1); $int1 = calc($int1 + 1); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setsize(0, 0, ^setsize_minus, ^setsize_minus); cc_setfill(false); cc_setcolour(0x0e0e0c); -_103($entityoverlay0, ^iftype_rectangle, $int1); +cc_create_entityoverlay($entityoverlay0, ^iftype_rectangle, $int1); $int1 = calc($int1 + 1); cc_setposition(0, 0, ^setpos_abs_centre, ^setpos_abs_centre); cc_setsize(2, 2, ^setsize_minus, ^setsize_minus); diff --git a/scripts/[proc,toplevel_redraw].cs2 b/scripts/[proc,toplevel_redraw].cs2 index 3406dbad5..ec67d33ba 100644 --- a/scripts/[proc,toplevel_redraw].cs2 +++ b/scripts/[proc,toplevel_redraw].cs2 @@ -26,7 +26,7 @@ if (%varcint73 > 0 & %varcint74 > 0 & ($int5 ! %varcint73 | $int4 ! %varcint74)) ~camera_do_zoom(%varcint73, %varcint74); } if_setonscrollwheel("camera_zoom(event_mousey)", $component3); -_2309(1, $component3); +if_setpinch(true, $component3); def_int $int6 = calc(%varbit3756 - 1); def_component $component7 = enum(int, component, enum_1139, $int6); def_component $component8 = enum(int, component, enum_1138, $int6); diff --git a/scripts/[proc,toplevel_resize_customise].cs2 b/scripts/[proc,toplevel_resize_customise].cs2 index 371d44970..80795b473 100644 --- a/scripts/[proc,toplevel_resize_customise].cs2 +++ b/scripts/[proc,toplevel_resize_customise].cs2 @@ -14,11 +14,11 @@ switch_enum ($enum1) { if_setposition($x2, 0, ^setpos_abs_right, ^setpos_abs_bottom, toplevel_pre_eoc:93); } if (%varbit4084 = 1) { - _2122("resize_map_mask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); + if_setclickmask("resize_map_mask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); } else if (%varbit13037 = 1) { - _2122("resize_map_clickmask_bond", enum(component, component, $enum1, toplevel_osrs_stretch:29)); + if_setclickmask("resize_map_clickmask_bond", enum(component, component, $enum1, toplevel_osrs_stretch:29)); } else { - _2122("resize_map_clickmask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); + if_setclickmask("resize_map_clickmask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); } %varcint384 = clientclock; if (~on_enhanced_desktop = 1) { @@ -26,11 +26,11 @@ switch_enum ($enum1) { } case enum_1130 : if (%varbit4084 = 1) { - _2122("resize_map_mask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); + if_setclickmask("resize_map_mask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); } else if (%varbit13037 = 1) { - _2122("resize_map_clickmask_bond", enum(component, component, $enum1, toplevel_osrs_stretch:29)); + if_setclickmask("resize_map_clickmask_bond", enum(component, component, $enum1, toplevel_osrs_stretch:29)); } else { - _2122("resize_map_clickmask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); + if_setclickmask("resize_map_clickmask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); } %varcint384 = clientclock; if (~on_enhanced_desktop = 1) { @@ -38,9 +38,9 @@ switch_enum ($enum1) { } case enum_1129 : if (~wiki_icon_enabled = 1) { - _2122("fixed_map_clickmask_wiki", enum(component, component, $enum1, toplevel_osrs_stretch:29)); + if_setclickmask("fixed_map_clickmask_wiki", enum(component, component, $enum1, toplevel_osrs_stretch:29)); } else { - _2122("fixed_map_clickmask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); + if_setclickmask("fixed_map_clickmask", enum(component, component, $enum1, toplevel_osrs_stretch:29)); } case enum_1745 : if (%varbit6257 = 1 | %varbit542 = 1) { diff --git a/scripts/[proc,wildwars_fogcolour].cs2 b/scripts/[proc,wildwars_fogcolour].cs2 index d92f2047b..620babc5a 100644 --- a/scripts/[proc,wildwars_fogcolour].cs2 +++ b/scripts/[proc,wildwars_fogcolour].cs2 @@ -9,7 +9,7 @@ if (%varbit5701 < 1) { if ($int1 ! 255) { if_settrans(255, interface_90:1); } - _2124(255, interface_90:1); + if_setgradienttrans(255, interface_90:1); return; } def_int $int2 = 0; @@ -81,4 +81,4 @@ if ($int1 < $int19) { $int1 = calc($int1 - 1); } if_settrans($int1, interface_90:1); -_2124(255, interface_90:1); +if_setgradienttrans(255, interface_90:1); diff --git a/scripts/[proc,worldmap_search_off].cs2 b/scripts/[proc,worldmap_search_off].cs2 index c6f203c3a..9cc989784 100644 --- a/scripts/[proc,worldmap_search_off].cs2 +++ b/scripts/[proc,worldmap_search_off].cs2 @@ -9,4 +9,4 @@ cc_setonmouserepeat("cc_graphic_swapper(event_com, event_comsubid, $graphic2, nu cc_setonmouseleave("cc_graphic_swapper(event_com, event_comsubid, $graphic1, null)"); cc_setop(1, "Search"); cc_setonop("worldmap_search_start($component0, cc_getid, .cc_getid)"); -_3138; +setkeyinputmode_all; diff --git a/scripts/[trigger_45,_].cs2 b/scripts/[trigger_45,_].cs2 index e43882840..2d7eedc56 100644 --- a/scripts/[trigger_45,_].cs2 +++ b/scripts/[trigger_45,_].cs2 @@ -1,3 +1,3 @@ // 7226 [trigger_45,_] -~script7227(_6950); +~ground_items_setup(tile_coord); diff --git a/scripts/[trigger_47,_].cs2 b/scripts/[trigger_47,_].cs2 index e1ca33bae..70a95a073 100644 --- a/scripts/[trigger_47,_].cs2 +++ b/scripts/[trigger_47,_].cs2 @@ -3,11 +3,11 @@ if (~on_enhanced_any = 0) { return; } -if (%varbit12979 = 0 | _7038(_6950, 4, 0) = true) { +if (%varbit12979 = 0 | highlight_tile_get(tile_coord, 4, 0) = true) { return; } -_7039(4); -if (_6902 > 0 & _6950 = _6903(0) | _6950 = coord) { +highlight_tile_clear(4); +if (player_route_length > 0 & tile_coord = player_route_get(0) | tile_coord = coord) { return; } -highlight_tile_on(_6950, 4, 0); +highlight_tile_on(tile_coord, 4, 0); diff --git a/scripts/[trigger_48,_].cs2 b/scripts/[trigger_48,_].cs2 index 54529c3ea..3fda873ec 100644 --- a/scripts/[trigger_48,_].cs2 +++ b/scripts/[trigger_48,_].cs2 @@ -6,5 +6,5 @@ if (~on_enhanced_desktop = 0) { if (%varbit12977 = 0) { return; } -_7039(5); -highlight_tile_on(_6950, 5, 0); +highlight_tile_clear(5); +highlight_tile_on(tile_coord, 5, 0); diff --git a/scripts/[trigger_49,_].cs2 b/scripts/[trigger_49,_].cs2 index bf742b029..0ebbae049 100644 --- a/scripts/[trigger_49,_].cs2 +++ b/scripts/[trigger_49,_].cs2 @@ -7,9 +7,9 @@ if (%varbit12978 = 0) { return; } if (uid = self_player_uid) { - _7039(3); - if (_6902 > 0) { - highlight_tile_on(_6903(0), 3, 0); + highlight_tile_clear(3); + if (player_route_length > 0) { + highlight_tile_on(player_route_get(0), 3, 0); } else { highlight_tile_on(coord, 3, 0); } diff --git a/scripts/[trigger_78,_].cs2 b/scripts/[trigger_78,_].cs2 index 3867848c9..7edd090ba 100644 --- a/scripts/[trigger_78,_].cs2 +++ b/scripts/[trigger_78,_].cs2 @@ -4,6 +4,6 @@ if (~on_enhanced_mobile = 0 | %varbit13666 = 1) { return; } ~entity_highlight_clear(4); -def_entityoverlay $entityoverlay0 = _7203(0, 0, 1, 1, 0); +def_entityoverlay $entityoverlay0 = entityoverlay_create_player(0, 0, 1, 1, 0); ~entity_highlight_active_loc(4); ~script5961($entityoverlay0); diff --git a/scripts/[trigger_79,_].cs2 b/scripts/[trigger_79,_].cs2 index d7405c090..8e83caf23 100644 --- a/scripts/[trigger_79,_].cs2 +++ b/scripts/[trigger_79,_].cs2 @@ -5,6 +5,6 @@ if (~on_enhanced_mobile = 0 | %varbit13666 = 1) { } ~entity_highlight_clear(4); def_entityoverlay $entityoverlay0 = null; -$entityoverlay0 = _7203(0, 0, 1, 1, 0); +$entityoverlay0 = entityoverlay_create_player(0, 0, 1, 1, 0); ~entity_highlight_active_obj(4); ~script5961($entityoverlay0); diff --git a/scripts/[trigger_80,_].cs2 b/scripts/[trigger_80,_].cs2 index d19e713fe..769902937 100644 --- a/scripts/[trigger_80,_].cs2 +++ b/scripts/[trigger_80,_].cs2 @@ -4,6 +4,6 @@ if (~on_enhanced_mobile = 0 | %varbit13666 = 1) { return; } ~entity_highlight_clear(4); -def_entityoverlay $entityoverlay0 = _7203(0, 0, 1, 1, 0); +def_entityoverlay $entityoverlay0 = entityoverlay_create_player(0, 0, 1, 1, 0); ~entity_highlight_active_npc(4); ~script5961($entityoverlay0); diff --git a/scripts/[trigger_81,_].cs2 b/scripts/[trigger_81,_].cs2 index c3863ef3d..8fb765a15 100644 --- a/scripts/[trigger_81,_].cs2 +++ b/scripts/[trigger_81,_].cs2 @@ -4,6 +4,6 @@ if (~on_enhanced_mobile = 0 | %varbit13666 = 1) { return; } ~entity_highlight_clear(4); -def_entityoverlay $entityoverlay0 = _7203(0, 0, 1, 1, 0); +def_entityoverlay $entityoverlay0 = entityoverlay_create_player(0, 0, 1, 1, 0); ~entity_highlight_active_player(4); ~script5961($entityoverlay0);