Remove legacy 'deluxe' field from built-in mods

This commit is contained in:
Agent X 2024-06-01 09:50:23 -04:00
parent a347f77b3c
commit b25fe89b41
29 changed files with 2 additions and 74 deletions

View file

@ -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_NONE = 0
ITEM_METAL_CAP = 1 ITEM_METAL_CAP = 1
ITEM_HAMMER = 2 ITEM_HAMMER = 2

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
ARENA_FLAG_INVALID_GLOBAL = 0xFF ARENA_FLAG_INVALID_GLOBAL = 0xFF
--- ---

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
gHudIcons = { gHudIcons = {
flags = { flags = {
[0] = { tex = TEX_FLAG, prevX = 0, prevY = 0, r = 255, g = 255, b = 255 }, [0] = { tex = TEX_FLAG, prevX = 0, prevY = 0, r = 255, g = 255, b = 255 },

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
gItemHeld = {} gItemHeld = {}
-- setup held items -- setup held items

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
local arenaItemTimeout = 30 * 15 -- 15 seconds local arenaItemTimeout = 30 * 15 -- 15 seconds
----------------- -----------------

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
sArenaKothPoints = {} sArenaKothPoints = {}
function bhv_arena_koth_init(obj) function bhv_arena_koth_init(obj)

View file

@ -1,5 +1,3 @@
ACT_LADDER = allocate_mario_action(ACT_GROUP_AIRBORNE | ACT_FLAG_AIR)
-- behavior params: -- behavior params:
-- ladder height -- ladder height

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
local function on_level_init() local function on_level_init()
if gNetworkPlayers[0].currLevelNum == LEVEL_ARENA_RAINBOW then if gNetworkPlayers[0].currLevelNum == LEVEL_ARENA_RAINBOW then
set_lighting_dir(1, -10) set_lighting_dir(1, -10)

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
---------------- ----------------
-- Teching v2 -- -- Teching v2 --
---------------- ----------------

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
PACKET_ARENA_DEATH = 1 PACKET_ARENA_DEATH = 1
PACKET_ARENA_HAMMER_HIT = 2 PACKET_ARENA_HAMMER_HIT = 2
PACKET_ARENA_RESPAWN = 3 PACKET_ARENA_RESPAWN = 3

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
------------ ------------
-- tables -- -- tables --
------------ ------------

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
define_custom_obj_fields({ define_custom_obj_fields({
oArenaBobombGlobalOwner = 'u32', oArenaBobombGlobalOwner = 'u32',
}) })

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
define_custom_obj_fields({ define_custom_obj_fields({
oArenaCannonBallGlobalOwner = 'u32', oArenaCannonBallGlobalOwner = 'u32',
oArenaCannonBallSize = 'f32', oArenaCannonBallSize = 'f32',

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
define_custom_obj_fields({ define_custom_obj_fields({
oArenaFlameGlobalOwner = 'u32', oArenaFlameGlobalOwner = 'u32',
}) })

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
--Scrolling Textures for Rainbow Road --Scrolling Textures for Rainbow Road
add_scroll_target(0, "arena_rainbow_dl_StarRoad_mesh_layer_5_vtx_0", 0, 539) 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) add_scroll_target(1, "arena_rainbow_dl_RoadBuilding_mesh_layer_1_vtx_0", 0, 122)

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
local pauseMenuShouldShowMusic = true local pauseMenuShouldShowMusic = true
local pauseMenuMusicRGBA = {200,200,200,255} local pauseMenuMusicRGBA = {200,200,200,255}
local pauseMenuShowLevelID = false local pauseMenuShowLevelID = false

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
define_custom_obj_fields({ define_custom_obj_fields({
oArenaSparkleOwner = 'u32', oArenaSparkleOwner = 'u32',
oArenaSparkleOffsetX = 'f32', oArenaSparkleOffsetX = 'f32',

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
sArenaSpawns = {} sArenaSpawns = {}
function bhv_arena_spawn_init(obj) function bhv_arena_spawn_init(obj)

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
define_custom_obj_fields({ define_custom_obj_fields({
oArenaSpringSprung = 'u32', oArenaSpringSprung = 'u32',
}) })

View file

@ -1,5 +1,3 @@
if SM64COOPDX_VERSION == nil then return end
function active_player(m) function active_player(m)
local np = gNetworkPlayers[m.playerIndex] local np = gNetworkPlayers[m.playerIndex]
if m.playerIndex == 0 then if m.playerIndex == 0 then

View file

@ -1,9 +1,6 @@
-- name: Arena -- name: Arena
-- description: An arena-shooter inspired game mode with custom weapons and levels.\nSeven gamemodes in one, three custom stages, and five weapons. -- 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 -- incompatible: gamemode arena
-- deluxe: true
if SM64COOPDX_VERSION == nil then return end
GAME_STATE_ACTIVE = 1 GAME_STATE_ACTIVE = 1
GAME_STATE_INACTIVE = 2 GAME_STATE_INACTIVE = 2

View file

@ -1,18 +1,6 @@
-- name: [CS] Extra Characters -- 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\\. -- 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 if not _G.charSelectExists then
local first = false local first = false
hook_event(HOOK_ON_LEVEL_INIT, function() hook_event(HOOK_ON_LEVEL_INIT, function()

View file

@ -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 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

View file

@ -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 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 = { cutsceneActns = {

View file

@ -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 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

View file

@ -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 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() function no_dialog_open()

View file

@ -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_MOVEMENT, act_dm_grounded_movement)
hook_mario_action(ACT_DM_GROUNDED_IDLE, 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) hook_mario_action(ACT_DM_AIR_MOVEMENT, act_dm_air_movement)

View file

@ -1,4 +1,3 @@
-- name: mQuake -- name: mQuake
-- incompatible: moveset -- incompatible: moveset
-- description: Quake style physics.\nCreated by 0x2480 with help from Agent X\n\n[Beta 2 Early Release] -- description: Quake style physics.\nCreated by 0x2480 with help from Agent X\n\n[Beta 2 Early Release]
-- deluxe: true

View file

@ -1,6 +1,6 @@
-- name: Personal Star Counter -- 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 -- 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 ----- ----- Localize functions -----