From 111f03dfc07da959556ab792fd973f4f7913fcd1 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:17:35 -0400 Subject: [PATCH] Improve built-in mods a bit --- mods/char-select-cjes-and-vl/main.lua | 24 +++++++++++++++++------- mods/char-select-extra-chars/main.lua | 5 +++-- mods/faster-swimming.lua | 2 +- mods/personal-starcount-ex.lua | 5 +++-- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/mods/char-select-cjes-and-vl/main.lua b/mods/char-select-cjes-and-vl/main.lua index d89f7307..f665610b 100644 --- a/mods/char-select-cjes-and-vl/main.lua +++ b/mods/char-select-cjes-and-vl/main.lua @@ -1,5 +1,18 @@ -- name: [CS] VL-Tone & Cjes Luigi --- description: A character swap mod using the Character Select's API. +-- description: [CS] VL-Tone & Cjes Luigi\nBy Coop Deluxe Team\n\nnThis Character Select pack adds VL-Tone Luigi and Cjes Luigi, who was originally the model for luigi in earlier versions of sm64ex-coop. +-- pausable: true + +if not _G.charSelectExists then + local first = false + hook_event(HOOK_ON_LEVEL_INIT, function() + if not first then + first = true + play_sound(SOUND_MENU_CAMERA_BUZZ, gGlobalSoundSource) + djui_chat_message_create("\\#ffffa0\\Extra Characters requires Character Select to be enabled.\nPlease rehost with it enabled.") + end + end) + return +end local E_MODEL_VL = smlua_model_util_get_id("vl_geo") local E_MODEL_CJES = smlua_model_util_get_id("cjes_geo") @@ -8,9 +21,6 @@ local TEXT_MOD_NAME = "VL-Tone & Cjes Luigi" local TEX_LUIGI = get_texture_info("luigi-icon") -if _G.charSelectExists then - _G.charSelect.character_add("VL-Tone Luigi", {" A fanmade model of Luigi.", "The model was created for the", "program Toad's Tool 64, a romhack editor.", "This model is a nostalgic throwback to", "many players in the SM64 Community!"}, "VL-Tone", {r = 0, g = 152, b = 0}, E_MODEL_VL, CT_LUIGI, TEX_LUIGI) - _G.charSelect.character_add("Cjes Luigi", {"Another fanmade Luigi model.", "The model originates from Super", "Luigi 64 in 2015.", "This model originally was the", "main Luigi model for ex-Coop before", "the giga leak occured in 2020 and", "eventually replaced it." }, "Cjes", {r = 0, g = 152, b = 0}, E_MODEL_CJES, CT_LUIGI, TEX_LUIGI) -else - djui_popup_create("\\#ffffdc\\\n"..TEXT_MOD_NAME.."\nRequires the Character Select Mod\nto use as a Library!\n\nPlease turn on the Character Select Mod\nand Restart the Room!", 6) -end \ No newline at end of file +_G.charSelect.character_add("VL-Tone Luigi", {" A fanmade model of Luigi.", "The model was created for the", "program Toad's Tool 64, a romhack editor.", "This model is a nostalgic throwback to", "many players in the SM64 Community!"}, "VL-Tone", {r = 0, g = 152, b = 0}, E_MODEL_VL, CT_LUIGI, TEX_LUIGI) + +_G.charSelect.character_add("Cjes Luigi", {"Another fanmade Luigi model.", "The model originates from Super", "Luigi 64 in 2015.", "This model originally was the", "main Luigi model for sm64ex-coop before", "the giga leak occured in 2020 and", "eventually replaced it." }, "Cjes", {r = 0, g = 152, b = 0}, E_MODEL_CJES, CT_LUIGI, TEX_LUIGI) diff --git a/mods/char-select-extra-chars/main.lua b/mods/char-select-extra-chars/main.lua index b7e2d8e4..7504c2d5 100644 --- a/mods/char-select-extra-chars/main.lua +++ b/mods/char-select-extra-chars/main.lua @@ -1,5 +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\\. +-- 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 just \\#ff46a1\\Toadette\\#dcdcdc\\. +-- pausable: true if not _G.charSelectExists then local first = false @@ -58,4 +59,4 @@ hook_event(HOOK_MARIO_UPDATE, function (m) end) hook_event(HOOK_CHARACTER_SOUND, function (m, sound) if _G.charSelect.character_get_voice(m) == VOICETABLE_TOADETTE then return _G.charSelect.voice.sound(m, sound) end -end) \ No newline at end of file +end) diff --git a/mods/faster-swimming.lua b/mods/faster-swimming.lua index d8c9dd27..1ef77b18 100644 --- a/mods/faster-swimming.lua +++ b/mods/faster-swimming.lua @@ -1,6 +1,6 @@ -- name: Faster Swimming --- incompatible: -- description: Everyone swims faster. +-- pausable: true function mario_before_phys_step(m) local hScale = 1.0 diff --git a/mods/personal-starcount-ex.lua b/mods/personal-starcount-ex.lua index 80d18a3b..0c1d2f3d 100644 --- a/mods/personal-starcount-ex.lua +++ b/mods/personal-starcount-ex.lua @@ -1,6 +1,7 @@ -- 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 +-- 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 +-- pausable: true ------------------------------ ----- Localize functions ----- @@ -352,4 +353,4 @@ _G.PersonalStarCounter = { mod_storage_save("StarCounter", tostring(TotalStarCounter)) end end -} \ No newline at end of file +}