From b25fe89b418175d8db5bc2e9bc14eb82afee3f17 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Sat, 1 Jun 2024 09:50:23 -0400 Subject: [PATCH] Remove legacy 'deluxe' field from built-in mods --- mods/arena/aa-arena-constants.lua | 12 ------------ mods/arena/arena-flag.lua | 2 -- mods/arena/arena-hud.lua | 2 -- mods/arena/arena-item-held.lua | 2 -- mods/arena/arena-item.lua | 2 -- mods/arena/arena-koth-point.lua | 2 -- mods/arena/arena-ladder.lua | 2 -- mods/arena/arena-lighting.lua | 2 -- mods/arena/arena-moveset.lua | 2 -- mods/arena/arena-network.lua | 2 -- mods/arena/arena-player.lua | 2 -- mods/arena/arena-proj-bobomb.lua | 2 -- mods/arena/arena-proj-cannon-ball.lua | 2 -- mods/arena/arena-proj-flame.lua | 2 -- mods/arena/arena-scrolling-textures.lua | 2 -- mods/arena/arena-sound.lua | 2 -- mods/arena/arena-sparkle.lua | 2 -- mods/arena/arena-spawn.lua | 2 -- mods/arena/arena-spring.lua | 2 -- mods/arena/arena-utils.lua | 2 -- mods/arena/main.lua | 3 --- mods/char-select-extra-chars/main.lua | 12 ------------ mods/mquake/_mquake_b_physics.lua | 1 - mods/mquake/_mquake_c_moveset_functions.lua | 1 - mods/mquake/_mquake_d_actions.lua | 1 - mods/mquake/_mquake_e_hook_functions.lua | 1 - mods/mquake/_mquake_f_hooks.lua | 2 -- mods/mquake/main.lua | 3 +-- mods/personal-starcount-ex.lua | 2 +- 29 files changed, 2 insertions(+), 74 deletions(-) diff --git a/mods/arena/aa-arena-constants.lua b/mods/arena/aa-arena-constants.lua index 4b3b3d8e..fdfda77b 100644 --- a/mods/arena/aa-arena-constants.lua +++ b/mods/arena/aa-arena-constants.lua @@ -1,15 +1,3 @@ -if SM64COOPDX_VERSION == nil then - local first = false - hook_event(HOOK_ON_LEVEL_INIT, function() - if not first then - first = true - play_sound(SOUND_MENU_CAMERA_BUZZ, gMarioStates[0].marioObj.header.gfx.cameraToObject) - djui_chat_message_create("\\#ff7f7f\\This version of Arena is not supported with sm64ex-coop\nas it uses sm64coopdx exclusive Lua functionality.\n\\#dcdcdc\\To play this mod, try out sm64coopdx at\n\\#7f7fff\\https://sm64coopdx.com") - end - end) - return -end - ITEM_NONE = 0 ITEM_METAL_CAP = 1 ITEM_HAMMER = 2 diff --git a/mods/arena/arena-flag.lua b/mods/arena/arena-flag.lua index 0351823a..9ed13d7b 100644 --- a/mods/arena/arena-flag.lua +++ b/mods/arena/arena-flag.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - ARENA_FLAG_INVALID_GLOBAL = 0xFF --- diff --git a/mods/arena/arena-hud.lua b/mods/arena/arena-hud.lua index 9f962e63..f10cebaa 100644 --- a/mods/arena/arena-hud.lua +++ b/mods/arena/arena-hud.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - gHudIcons = { flags = { [0] = { tex = TEX_FLAG, prevX = 0, prevY = 0, r = 255, g = 255, b = 255 }, diff --git a/mods/arena/arena-item-held.lua b/mods/arena/arena-item-held.lua index b2de864d..cd54abdf 100644 --- a/mods/arena/arena-item-held.lua +++ b/mods/arena/arena-item-held.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - gItemHeld = {} -- setup held items diff --git a/mods/arena/arena-item.lua b/mods/arena/arena-item.lua index 5a36000b..c20a96bf 100644 --- a/mods/arena/arena-item.lua +++ b/mods/arena/arena-item.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - local arenaItemTimeout = 30 * 15 -- 15 seconds ----------------- diff --git a/mods/arena/arena-koth-point.lua b/mods/arena/arena-koth-point.lua index 7b8fa82b..e62dce22 100644 --- a/mods/arena/arena-koth-point.lua +++ b/mods/arena/arena-koth-point.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - sArenaKothPoints = {} function bhv_arena_koth_init(obj) diff --git a/mods/arena/arena-ladder.lua b/mods/arena/arena-ladder.lua index 0105ed9a..896d4202 100644 --- a/mods/arena/arena-ladder.lua +++ b/mods/arena/arena-ladder.lua @@ -1,5 +1,3 @@ -ACT_LADDER = allocate_mario_action(ACT_GROUP_AIRBORNE | ACT_FLAG_AIR) - -- behavior params: -- ladder height diff --git a/mods/arena/arena-lighting.lua b/mods/arena/arena-lighting.lua index cfbf0df3..6b7df6a3 100644 --- a/mods/arena/arena-lighting.lua +++ b/mods/arena/arena-lighting.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - local function on_level_init() if gNetworkPlayers[0].currLevelNum == LEVEL_ARENA_RAINBOW then set_lighting_dir(1, -10) diff --git a/mods/arena/arena-moveset.lua b/mods/arena/arena-moveset.lua index 319d5e07..3161894b 100644 --- a/mods/arena/arena-moveset.lua +++ b/mods/arena/arena-moveset.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - ---------------- -- Teching v2 -- ---------------- diff --git a/mods/arena/arena-network.lua b/mods/arena/arena-network.lua index b98d2487..e394c9f5 100644 --- a/mods/arena/arena-network.lua +++ b/mods/arena/arena-network.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - PACKET_ARENA_DEATH = 1 PACKET_ARENA_HAMMER_HIT = 2 PACKET_ARENA_RESPAWN = 3 diff --git a/mods/arena/arena-player.lua b/mods/arena/arena-player.lua index 7dbc7157..4a7c58d1 100644 --- a/mods/arena/arena-player.lua +++ b/mods/arena/arena-player.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - ------------ -- tables -- ------------ diff --git a/mods/arena/arena-proj-bobomb.lua b/mods/arena/arena-proj-bobomb.lua index 2906b24c..533eb36d 100644 --- a/mods/arena/arena-proj-bobomb.lua +++ b/mods/arena/arena-proj-bobomb.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - define_custom_obj_fields({ oArenaBobombGlobalOwner = 'u32', }) diff --git a/mods/arena/arena-proj-cannon-ball.lua b/mods/arena/arena-proj-cannon-ball.lua index 17663191..3a99e8f1 100644 --- a/mods/arena/arena-proj-cannon-ball.lua +++ b/mods/arena/arena-proj-cannon-ball.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - define_custom_obj_fields({ oArenaCannonBallGlobalOwner = 'u32', oArenaCannonBallSize = 'f32', diff --git a/mods/arena/arena-proj-flame.lua b/mods/arena/arena-proj-flame.lua index ac85be87..537f6902 100644 --- a/mods/arena/arena-proj-flame.lua +++ b/mods/arena/arena-proj-flame.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - define_custom_obj_fields({ oArenaFlameGlobalOwner = 'u32', }) diff --git a/mods/arena/arena-scrolling-textures.lua b/mods/arena/arena-scrolling-textures.lua index 73e95e59..5672a76c 100644 --- a/mods/arena/arena-scrolling-textures.lua +++ b/mods/arena/arena-scrolling-textures.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - --Scrolling Textures for Rainbow Road add_scroll_target(0, "arena_rainbow_dl_StarRoad_mesh_layer_5_vtx_0", 0, 539) add_scroll_target(1, "arena_rainbow_dl_RoadBuilding_mesh_layer_1_vtx_0", 0, 122) diff --git a/mods/arena/arena-sound.lua b/mods/arena/arena-sound.lua index fc932785..0b48d2dd 100644 --- a/mods/arena/arena-sound.lua +++ b/mods/arena/arena-sound.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - local pauseMenuShouldShowMusic = true local pauseMenuMusicRGBA = {200,200,200,255} local pauseMenuShowLevelID = false diff --git a/mods/arena/arena-sparkle.lua b/mods/arena/arena-sparkle.lua index fb7525ae..7c31b492 100644 --- a/mods/arena/arena-sparkle.lua +++ b/mods/arena/arena-sparkle.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - define_custom_obj_fields({ oArenaSparkleOwner = 'u32', oArenaSparkleOffsetX = 'f32', diff --git a/mods/arena/arena-spawn.lua b/mods/arena/arena-spawn.lua index 0f619163..87bd0f13 100644 --- a/mods/arena/arena-spawn.lua +++ b/mods/arena/arena-spawn.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - sArenaSpawns = {} function bhv_arena_spawn_init(obj) diff --git a/mods/arena/arena-spring.lua b/mods/arena/arena-spring.lua index f5c45c16..0ac7eebf 100644 --- a/mods/arena/arena-spring.lua +++ b/mods/arena/arena-spring.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - define_custom_obj_fields({ oArenaSpringSprung = 'u32', }) diff --git a/mods/arena/arena-utils.lua b/mods/arena/arena-utils.lua index 6d9f1eda..f5e3a1e9 100644 --- a/mods/arena/arena-utils.lua +++ b/mods/arena/arena-utils.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - function active_player(m) local np = gNetworkPlayers[m.playerIndex] if m.playerIndex == 0 then diff --git a/mods/arena/main.lua b/mods/arena/main.lua index 90b2a0f5..83cf930b 100644 --- a/mods/arena/main.lua +++ b/mods/arena/main.lua @@ -1,9 +1,6 @@ -- name: Arena -- description: An arena-shooter inspired game mode with custom weapons and levels.\nSeven gamemodes in one, three custom stages, and five weapons. -- incompatible: gamemode arena --- deluxe: true - -if SM64COOPDX_VERSION == nil then return end GAME_STATE_ACTIVE = 1 GAME_STATE_INACTIVE = 2 diff --git a/mods/char-select-extra-chars/main.lua b/mods/char-select-extra-chars/main.lua index 03cd434a..b7e2d8e4 100644 --- a/mods/char-select-extra-chars/main.lua +++ b/mods/char-select-extra-chars/main.lua @@ -1,18 +1,6 @@ -- name: [CS] Extra Characters -- description: [CS] Extra Characters\nBy Coop Deluxe Team\n\nThis Character Select pack adds other characters from the Mario series! Currently, The only character that has been added is \\#ff46a1\\Toadette\\#dcdcdc\\. --- deluxe: true -if SM64COOPDX_VERSION == nil then - local first = false - hook_event(HOOK_ON_LEVEL_INIT, function() - if not first then - first = true - play_sound(SOUND_MENU_CAMERA_BUZZ, gMarioStates[0].marioObj.header.gfx.cameraToObject) - djui_chat_message_create("\\#ffa0a0\\Extra Characters is not supported with sm64ex-coop\nas it uses sm64coopdx exclusive Lua functionality.\n\\#dcdcdc\\To play this mod, try out sm64coopdx at\n\\#7f7fff\\https://sm64coopdx.com") - end - end) - return -end if not _G.charSelectExists then local first = false hook_event(HOOK_ON_LEVEL_INIT, function() diff --git a/mods/mquake/_mquake_b_physics.lua b/mods/mquake/_mquake_b_physics.lua index af243f5f..61882c1d 100644 --- a/mods/mquake/_mquake_b_physics.lua +++ b/mods/mquake/_mquake_b_physics.lua @@ -1,4 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end local collision_find_surface_on_ray,vec3f_dist,vec3f_sub,vec3f_dot,vec3f_project,vec3f_add,vec3f_copy,level_trigger_warp,vec3f_length,clampf,is_game_paused,vec3f_normalize,vec3f_mul = collision_find_surface_on_ray,vec3f_dist,vec3f_sub,vec3f_dot,vec3f_project,vec3f_add,vec3f_copy,level_trigger_warp,vec3f_length,clampf,is_game_paused,vec3f_normalize,vec3f_mul diff --git a/mods/mquake/_mquake_c_moveset_functions.lua b/mods/mquake/_mquake_c_moveset_functions.lua index 38f865f8..59ac2d73 100644 --- a/mods/mquake/_mquake_c_moveset_functions.lua +++ b/mods/mquake/_mquake_c_moveset_functions.lua @@ -1,4 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end local get_dialog_box_state,get_dialog_id,disable_time_stop,save_file_get_flags,get_id_from_behavior,save_file_get_total_star_count,get_current_save_file_num,max,level_trigger_warp,obj_is_attackable,obj_is_breakable_object,obj_is_bully,obj_is_exclamation_box,bhv_spawn_star_no_level_exit,mario_drop_held_object,absf_2,clampf,set_mario_action,vec3f_add,mario_grab_used_object,mario_throw_held_object,play_character_sound,obj_is_grabbable,play_sound = get_dialog_box_state,get_dialog_id,disable_time_stop,save_file_get_flags,get_id_from_behavior,save_file_get_total_star_count,get_current_save_file_num,max,level_trigger_warp,obj_is_attackable,obj_is_breakable_object,obj_is_bully,obj_is_exclamation_box,bhv_spawn_star_no_level_exit,mario_drop_held_object,absf_2,clampf,set_mario_action,vec3f_add,mario_grab_used_object,mario_throw_held_object,play_character_sound,obj_is_grabbable,play_sound cutsceneActns = { diff --git a/mods/mquake/_mquake_d_actions.lua b/mods/mquake/_mquake_d_actions.lua index 11ee6a83..e5c0a77b 100644 --- a/mods/mquake/_mquake_d_actions.lua +++ b/mods/mquake/_mquake_d_actions.lua @@ -1,4 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end local play_step_sound,set_mario_action,play_character_sound,vec3f_length,perform_ground_step,vec3f_copy,perform_air_step,clampf,vec3f_add,set_mario_particle_flags,play_mario_heavy_landing_sound = play_step_sound,set_mario_action,play_character_sound,vec3f_length,perform_ground_step,vec3f_copy,perform_air_step,clampf,vec3f_add,set_mario_particle_flags,play_mario_heavy_landing_sound diff --git a/mods/mquake/_mquake_e_hook_functions.lua b/mods/mquake/_mquake_e_hook_functions.lua index 9d394617..9c6e06c2 100644 --- a/mods/mquake/_mquake_e_hook_functions.lua +++ b/mods/mquake/_mquake_e_hook_functions.lua @@ -1,4 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end local is_player_active,vec3f_copy,set_mario_action,perform_air_step,save_file_get_flags,save_file_set_flags,save_file_do_save,get_current_save_file_num,vec3f_dot,get_id_from_behavior,djui_hud_set_color,djui_hud_render_rect,djui_hud_print_text,djui_hud_set_resolution,djui_hud_get_screen_width,djui_hud_get_screen_height,djui_hud_set_font,vec3f_length,math_floor,djui_hud_measure_text,get_cutscene_from_mario_status,obj_get_first,obj_get_next,obj_get_nearest_object_with_behavior_id,obj_check_hitbox_overlap = is_player_active,vec3f_copy,set_mario_action,perform_air_step,save_file_get_flags,save_file_set_flags,save_file_do_save,get_current_save_file_num,vec3f_dot,get_id_from_behavior,djui_hud_set_color,djui_hud_render_rect,djui_hud_print_text,djui_hud_set_resolution,djui_hud_get_screen_width,djui_hud_get_screen_height,djui_hud_set_font,vec3f_length,math.floor,djui_hud_measure_text,get_cutscene_from_mario_status,obj_get_first,obj_get_next,obj_get_nearest_object_with_behavior_id,obj_check_hitbox_overlap function no_dialog_open() diff --git a/mods/mquake/_mquake_f_hooks.lua b/mods/mquake/_mquake_f_hooks.lua index 27dbeb79..05d972dd 100644 --- a/mods/mquake/_mquake_f_hooks.lua +++ b/mods/mquake/_mquake_f_hooks.lua @@ -1,5 +1,3 @@ -if SM64COOPDX_VERSION == nil then return end - hook_mario_action(ACT_DM_GROUNDED_MOVEMENT, act_dm_grounded_movement) hook_mario_action(ACT_DM_GROUNDED_IDLE, act_dm_grounded_movement) hook_mario_action(ACT_DM_AIR_MOVEMENT, act_dm_air_movement) diff --git a/mods/mquake/main.lua b/mods/mquake/main.lua index 8d51fd95..c30eda32 100644 --- a/mods/mquake/main.lua +++ b/mods/mquake/main.lua @@ -1,4 +1,3 @@ -- name: mQuake -- incompatible: moveset --- description: Quake style physics.\nCreated by 0x2480 with help from Agent X\n\n[Beta 2 Early Release] --- deluxe: true \ No newline at end of file +-- description: Quake style physics.\nCreated by 0x2480 with help from Agent X\n\n[Beta 2 Early Release] \ No newline at end of file diff --git a/mods/personal-starcount-ex.lua b/mods/personal-starcount-ex.lua index 21c16b35..80d18a3b 100644 --- a/mods/personal-starcount-ex.lua +++ b/mods/personal-starcount-ex.lua @@ -1,6 +1,6 @@ -- name: Personal Star Counter -- description: See how many stars you've collected!\n\nCredits:\n\\#097419\\Mr.Needlemouse\\#FFFFFF\\ - Concept\nSunk\\#dcdcdc\\ - Creator\n\\#269A91\\Demnyx\\#dcdcdc\\ - Assistance\n\\#f296af\\PeachyPeach\\#dcdcdc\\ - Global functions --- incompatible: gamemode arena +-- incompatible: gamemode ------------------------------ ----- Localize functions -----