diff --git a/.gitignore b/.gitignore index 23718be..d6f0771 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .temp .vscode **/*.zip +*.zip vmf/bundleV1 vmf/bundleV2 -node_modules \ No newline at end of file +node_modules diff --git a/.luacheckrc b/.luacheckrc index fecfcdf..7607f9a 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -1,7 +1,7 @@ max_line_length = 120 include_files = { - "**/scripts/", + "scripts/", } ignore = { diff --git a/dmf/dmf.mod b/dmf/dmf.mod deleted file mode 100644 index 75324e0..0000000 --- a/dmf/dmf.mod +++ /dev/null @@ -1,5 +0,0 @@ -return { - run = function() - return Mods.file.dofile("dmf/scripts/mods/dmf/dmf_loader") - end -} diff --git a/dtmt.cfg b/dtmt.cfg new file mode 100644 index 0000000..90eb921 --- /dev/null +++ b/dtmt.cfg @@ -0,0 +1,18 @@ +id = "dmf" +name = "Darktide Mod Framework" +description = "An open-source, community-run framework that provides enhanced Darktide modding support." +version = "2023-02-18" + +// DMF is special and handles `data` and `localization` internally, as it is what sets up these systems +// in the first place. But to keep mod tools and their config format simple, we don't allow +// omitting these values completely just for one exception. +// Instead we just define an empty string, which will be ingored by the tools. +resources = { + init = "scripts/mods/dmf/dmf_loader" + data = "" + localization = "" +} + +packages = [ + "packages/dmf" +] diff --git a/dmf/localization/dmf.lua b/localization/dmf.lua similarity index 100% rename from dmf/localization/dmf.lua rename to localization/dmf.lua diff --git a/packages/dmf.package b/packages/dmf.package new file mode 100644 index 0000000..4528468 --- /dev/null +++ b/packages/dmf.package @@ -0,0 +1,3 @@ +lua = [ + "scripts/mods/dmf/*" +] diff --git a/dmf/scripts/mods/dmf/dmf_loader.lua b/scripts/mods/dmf/dmf_loader.lua similarity index 100% rename from dmf/scripts/mods/dmf/dmf_loader.lua rename to scripts/mods/dmf/dmf_loader.lua diff --git a/dmf/scripts/mods/dmf/modules/core/chat.lua b/scripts/mods/dmf/modules/core/chat.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/chat.lua rename to scripts/mods/dmf/modules/core/chat.lua diff --git a/dmf/scripts/mods/dmf/modules/core/commands.lua b/scripts/mods/dmf/modules/core/commands.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/commands.lua rename to scripts/mods/dmf/modules/core/commands.lua diff --git a/dmf/scripts/mods/dmf/modules/core/events.lua b/scripts/mods/dmf/modules/core/events.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/events.lua rename to scripts/mods/dmf/modules/core/events.lua diff --git a/dmf/scripts/mods/dmf/modules/core/hooks.lua b/scripts/mods/dmf/modules/core/hooks.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/hooks.lua rename to scripts/mods/dmf/modules/core/hooks.lua diff --git a/dmf/scripts/mods/dmf/modules/core/io.lua b/scripts/mods/dmf/modules/core/io.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/io.lua rename to scripts/mods/dmf/modules/core/io.lua diff --git a/dmf/scripts/mods/dmf/modules/core/keybindings.lua b/scripts/mods/dmf/modules/core/keybindings.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/keybindings.lua rename to scripts/mods/dmf/modules/core/keybindings.lua diff --git a/dmf/scripts/mods/dmf/modules/core/localization.lua b/scripts/mods/dmf/modules/core/localization.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/localization.lua rename to scripts/mods/dmf/modules/core/localization.lua diff --git a/dmf/scripts/mods/dmf/modules/core/logging.lua b/scripts/mods/dmf/modules/core/logging.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/logging.lua rename to scripts/mods/dmf/modules/core/logging.lua diff --git a/dmf/scripts/mods/dmf/modules/core/misc.lua b/scripts/mods/dmf/modules/core/misc.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/misc.lua rename to scripts/mods/dmf/modules/core/misc.lua diff --git a/dmf/scripts/mods/dmf/modules/core/mutators/mutators_default_config.lua b/scripts/mods/dmf/modules/core/mutators/mutators_default_config.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/mutators/mutators_default_config.lua rename to scripts/mods/dmf/modules/core/mutators/mutators_default_config.lua diff --git a/dmf/scripts/mods/dmf/modules/core/mutators/mutators_info.lua b/scripts/mods/dmf/modules/core/mutators/mutators_info.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/mutators/mutators_info.lua rename to scripts/mods/dmf/modules/core/mutators/mutators_info.lua diff --git a/dmf/scripts/mods/dmf/modules/core/mutators/mutators_manager.lua b/scripts/mods/dmf/modules/core/mutators/mutators_manager.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/mutators/mutators_manager.lua rename to scripts/mods/dmf/modules/core/mutators/mutators_manager.lua diff --git a/dmf/scripts/mods/dmf/modules/core/mutators/mutators_reward.lua b/scripts/mods/dmf/modules/core/mutators/mutators_reward.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/mutators/mutators_reward.lua rename to scripts/mods/dmf/modules/core/mutators/mutators_reward.lua diff --git a/dmf/scripts/mods/dmf/modules/core/mutators/test/mutators_test.lua b/scripts/mods/dmf/modules/core/mutators/test/mutators_test.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/mutators/test/mutators_test.lua rename to scripts/mods/dmf/modules/core/mutators/test/mutators_test.lua diff --git a/dmf/scripts/mods/dmf/modules/core/network.lua b/scripts/mods/dmf/modules/core/network.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/network.lua rename to scripts/mods/dmf/modules/core/network.lua diff --git a/dmf/scripts/mods/dmf/modules/core/options.lua b/scripts/mods/dmf/modules/core/options.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/options.lua rename to scripts/mods/dmf/modules/core/options.lua diff --git a/dmf/scripts/mods/dmf/modules/core/persistent_tables.lua b/scripts/mods/dmf/modules/core/persistent_tables.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/persistent_tables.lua rename to scripts/mods/dmf/modules/core/persistent_tables.lua diff --git a/dmf/scripts/mods/dmf/modules/core/require.lua b/scripts/mods/dmf/modules/core/require.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/require.lua rename to scripts/mods/dmf/modules/core/require.lua diff --git a/dmf/scripts/mods/dmf/modules/core/safe_calls.lua b/scripts/mods/dmf/modules/core/safe_calls.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/safe_calls.lua rename to scripts/mods/dmf/modules/core/safe_calls.lua diff --git a/dmf/scripts/mods/dmf/modules/core/settings.lua b/scripts/mods/dmf/modules/core/settings.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/settings.lua rename to scripts/mods/dmf/modules/core/settings.lua diff --git a/dmf/scripts/mods/dmf/modules/core/toggling.lua b/scripts/mods/dmf/modules/core/toggling.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/core/toggling.lua rename to scripts/mods/dmf/modules/core/toggling.lua diff --git a/dmf/scripts/mods/dmf/modules/debug/dev_console.lua b/scripts/mods/dmf/modules/debug/dev_console.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/debug/dev_console.lua rename to scripts/mods/dmf/modules/debug/dev_console.lua diff --git a/dmf/scripts/mods/dmf/modules/debug/table_dump.lua b/scripts/mods/dmf/modules/debug/table_dump.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/debug/table_dump.lua rename to scripts/mods/dmf/modules/debug/table_dump.lua diff --git a/dmf/scripts/mods/dmf/modules/dmf_dummy.lua b/scripts/mods/dmf/modules/dmf_dummy.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/dmf_dummy.lua rename to scripts/mods/dmf/modules/dmf_dummy.lua diff --git a/dmf/scripts/mods/dmf/modules/dmf_mod_data.lua b/scripts/mods/dmf/modules/dmf_mod_data.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/dmf_mod_data.lua rename to scripts/mods/dmf/modules/dmf_mod_data.lua diff --git a/dmf/scripts/mods/dmf/modules/dmf_mod_manager.lua b/scripts/mods/dmf/modules/dmf_mod_manager.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/dmf_mod_manager.lua rename to scripts/mods/dmf/modules/dmf_mod_manager.lua diff --git a/dmf/scripts/mods/dmf/modules/dmf_options.lua b/scripts/mods/dmf/modules/dmf_options.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/dmf_options.lua rename to scripts/mods/dmf/modules/dmf_options.lua diff --git a/dmf/scripts/mods/dmf/modules/dmf_package_manager.lua b/scripts/mods/dmf/modules/dmf_package_manager.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/dmf_package_manager.lua rename to scripts/mods/dmf/modules/dmf_package_manager.lua diff --git a/dmf/scripts/mods/dmf/modules/gui/custom_textures.lua b/scripts/mods/dmf/modules/gui/custom_textures.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/gui/custom_textures.lua rename to scripts/mods/dmf/modules/gui/custom_textures.lua diff --git a/dmf/scripts/mods/dmf/modules/gui/custom_views.lua b/scripts/mods/dmf/modules/gui/custom_views.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/gui/custom_views.lua rename to scripts/mods/dmf/modules/gui/custom_views.lua diff --git a/dmf/scripts/mods/dmf/modules/ui/chat/chat_actions.lua b/scripts/mods/dmf/modules/ui/chat/chat_actions.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/ui/chat/chat_actions.lua rename to scripts/mods/dmf/modules/ui/chat/chat_actions.lua diff --git a/dmf/scripts/mods/dmf/modules/ui/chat/commands_list_gui.lua b/scripts/mods/dmf/modules/ui/chat/commands_list_gui.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/ui/chat/commands_list_gui.lua rename to scripts/mods/dmf/modules/ui/chat/commands_list_gui.lua diff --git a/dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view.lua b/scripts/mods/dmf/modules/ui/options/dmf_options_view.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view.lua rename to scripts/mods/dmf/modules/ui/options/dmf_options_view.lua diff --git a/dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints.lua b/scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints.lua rename to scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints.lua diff --git a/dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions.lua b/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions.lua rename to scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions.lua diff --git a/dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_settings.lua b/scripts/mods/dmf/modules/ui/options/dmf_options_view_settings.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_settings.lua rename to scripts/mods/dmf/modules/ui/options/dmf_options_view_settings.lua diff --git a/dmf/scripts/mods/dmf/modules/ui/options/mod_options.lua b/scripts/mods/dmf/modules/ui/options/mod_options.lua similarity index 100% rename from dmf/scripts/mods/dmf/modules/ui/options/mod_options.lua rename to scripts/mods/dmf/modules/ui/options/mod_options.lua