diff --git a/scripts/mods/dmf/dmf_loader.lua b/scripts/mods/dmf/dmf_loader.lua index 8a6f060..ee64df5 100644 --- a/scripts/mods/dmf/dmf_loader.lua +++ b/scripts/mods/dmf/dmf_loader.lua @@ -11,37 +11,37 @@ local print = __print -- ##################################################################################################################### function dmf_mod_object:init() - dofile("dmf/scripts/mods/dmf/modules/dmf_mod_data") - dofile("dmf/scripts/mods/dmf/modules/dmf_mod_manager") - -- dofile("dmf/scripts/mods/dmf/modules/dmf_dummy") - dofile("dmf/scripts/mods/dmf/modules/dmf_package_manager") - dofile("dmf/scripts/mods/dmf/modules/core/safe_calls") - dofile("dmf/scripts/mods/dmf/modules/core/events") - dofile("dmf/scripts/mods/dmf/modules/core/settings") - dofile("dmf/scripts/mods/dmf/modules/core/logging") - dofile("dmf/scripts/mods/dmf/modules/core/misc") - dofile("dmf/scripts/mods/dmf/modules/core/persistent_tables") - dofile("dmf/scripts/mods/dmf/modules/core/io") + dofile("scripts/mods/dmf/modules/dmf_mod_data") + dofile("scripts/mods/dmf/modules/dmf_mod_manager") + -- dofile("scripts/mods/dmf/modules/dmf_dummy") + dofile("scripts/mods/dmf/modules/dmf_package_manager") + dofile("scripts/mods/dmf/modules/core/safe_calls") + dofile("scripts/mods/dmf/modules/core/events") + dofile("scripts/mods/dmf/modules/core/settings") + dofile("scripts/mods/dmf/modules/core/logging") + dofile("scripts/mods/dmf/modules/core/misc") + dofile("scripts/mods/dmf/modules/core/persistent_tables") + dofile("scripts/mods/dmf/modules/core/io") dmf = get_mod("DMF") - dmf:dofile("dmf/scripts/mods/dmf/modules/debug/dev_console") - dmf:dofile("dmf/scripts/mods/dmf/modules/debug/table_dump") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/hooks") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/require") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/toggling") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/keybindings") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/chat") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/localization") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/options") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/network") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/commands") - dmf:dofile("dmf/scripts/mods/dmf/modules/gui/custom_textures") - dmf:dofile("dmf/scripts/mods/dmf/modules/gui/custom_views") - dmf:dofile("dmf/scripts/mods/dmf/modules/ui/chat/chat_actions") - dmf:dofile("dmf/scripts/mods/dmf/modules/ui/options/mod_options") - dmf:dofile("dmf/scripts/mods/dmf/modules/dmf_options") - dmf:dofile("dmf/scripts/mods/dmf/modules/core/mutators/mutators_manager") + dmf:dofile("scripts/mods/dmf/modules/debug/dev_console") + dmf:dofile("scripts/mods/dmf/modules/debug/table_dump") + dmf:dofile("scripts/mods/dmf/modules/core/hooks") + dmf:dofile("scripts/mods/dmf/modules/core/require") + dmf:dofile("scripts/mods/dmf/modules/core/toggling") + dmf:dofile("scripts/mods/dmf/modules/core/keybindings") + dmf:dofile("scripts/mods/dmf/modules/core/chat") + dmf:dofile("scripts/mods/dmf/modules/core/localization") + dmf:dofile("scripts/mods/dmf/modules/core/options") + dmf:dofile("scripts/mods/dmf/modules/core/network") + dmf:dofile("scripts/mods/dmf/modules/core/commands") + dmf:dofile("scripts/mods/dmf/modules/gui/custom_textures") + dmf:dofile("scripts/mods/dmf/modules/gui/custom_views") + dmf:dofile("scripts/mods/dmf/modules/ui/chat/chat_actions") + dmf:dofile("scripts/mods/dmf/modules/ui/options/mod_options") + dmf:dofile("scripts/mods/dmf/modules/dmf_options") + dmf:dofile("scripts/mods/dmf/modules/core/mutators/mutators_manager") dmf.delayed_chat_messages_hook() end diff --git a/localization/dmf.lua b/scripts/mods/dmf/localization/dmf.lua similarity index 100% rename from localization/dmf.lua rename to scripts/mods/dmf/localization/dmf.lua diff --git a/scripts/mods/dmf/modules/core/localization.lua b/scripts/mods/dmf/modules/core/localization.lua index bc149f1..3ffbf85 100644 --- a/scripts/mods/dmf/modules/core/localization.lua +++ b/scripts/mods/dmf/modules/core/localization.lua @@ -138,5 +138,5 @@ end -- ##### Script ####################################################################################################### -- #################################################################################################################### -local localization_table = dmf:dofile("dmf/localization/dmf") +local localization_table = dmf:dofile("scripts/mods/dmf/localization/dmf") dmf.initialize_mod_localization(dmf, localization_table) diff --git a/scripts/mods/dmf/modules/core/misc.lua b/scripts/mods/dmf/modules/core/misc.lua index b0c1f0c..f42091c 100644 --- a/scripts/mods/dmf/modules/core/misc.lua +++ b/scripts/mods/dmf/modules/core/misc.lua @@ -34,4 +34,4 @@ function dmf.deepcopy(original_table) copy = original_table end return copy -end \ No newline at end of file +end diff --git a/scripts/mods/dmf/modules/core/mutators/mutators_manager.lua b/scripts/mods/dmf/modules/core/mutators/mutators_manager.lua index a5f08f2..9dde361 100644 --- a/scripts/mods/dmf/modules/core/mutators/mutators_manager.lua +++ b/scripts/mods/dmf/modules/core/mutators/mutators_manager.lua @@ -27,11 +27,11 @@ local _mutators_sorted = false local _all_mutators_disabled = false -- External modules -local reward_manager = dmf:dofile("dmf/scripts/mods/dmf/modules/core/mutators/mutators_reward") -local set_lobby_data = dmf:dofile("dmf/scripts/mods/dmf/modules/core/mutators/mutators_info") +local reward_manager = dmf:dofile("scripts/mods/dmf/modules/core/mutators/mutators_reward") +local set_lobby_data = dmf:dofile("scripts/mods/dmf/modules/core/mutators/mutators_info") -- Get default configuration -local _default_config = dmf:dofile("dmf/scripts/mods/dmf/modules/core/mutators/mutators_default_config") +local _default_config = dmf:dofile("scripts/mods/dmf/modules/core/mutators/mutators_default_config") -- List of enabled mutators in case DMF is reloaded in the middle of the game local _enabled_mutators = dmf:persistent_table("enabled_mutators") @@ -505,4 +505,4 @@ end -- ##################################################################################################################### -- Testing ---dmf:dofile("dmf/scripts/mods/dmf/modules/core/mutators/test/mutators_test") +--dmf:dofile("scripts/mods/dmf/modules/core/mutators/test/mutators_test") diff --git a/scripts/mods/dmf/modules/ui/chat/chat_actions.lua b/scripts/mods/dmf/modules/ui/chat/chat_actions.lua index 32a859c..9f93366 100644 --- a/scripts/mods/dmf/modules/ui/chat/chat_actions.lua +++ b/scripts/mods/dmf/modules/ui/chat/chat_actions.lua @@ -33,7 +33,7 @@ local _queued_command local function initialize_drawing_function() if not _commands_list_gui_draw then - local commands_list_gui = dmf:dofile("dmf/scripts/mods/dmf/modules/ui/chat/commands_list_gui") + local commands_list_gui = dmf:dofile("scripts/mods/dmf/modules/ui/chat/commands_list_gui") _commands_list_gui_draw = commands_list_gui.draw _commands_list_gui_destroy = commands_list_gui.destroy end diff --git a/scripts/mods/dmf/modules/ui/options/dmf_options_view.lua b/scripts/mods/dmf/modules/ui/options/dmf_options_view.lua index 47470c0..badfdb9 100644 --- a/scripts/mods/dmf/modules/ui/options/dmf_options_view.lua +++ b/scripts/mods/dmf/modules/ui/options/dmf_options_view.lua @@ -30,8 +30,8 @@ end -- ##### DMF Options View Class ####################################################################################### -- #################################################################################################################### -local _content_blueprints = dmf:dofile("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints") -local _view_settings = dmf:dofile("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_settings") +local _content_blueprints = dmf:dofile("scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints") +local _view_settings = dmf:dofile("scripts/mods/dmf/modules/ui/options/dmf_options_view_settings") local InputUtils = require("scripts/managers/input/input_utils") local ScriptWorld = require("scripts/foundation/utilities/script_world") @@ -51,7 +51,7 @@ local _last_selected_category_widget local DMFOptionsView = class("DMFOptionsView", "BaseView") DMFOptionsView.init = function (self, settings) - local definitions = dmf:dofile("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions") + local definitions = dmf:dofile("scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions") DMFOptionsView.super.init(self, definitions, settings) diff --git a/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 index df2d098..bcceca0 100644 --- a/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 @@ -1,6 +1,6 @@ local dmf = get_mod("DMF") -local _view_settings = dmf:dofile("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_settings") +local _view_settings = dmf:dofile("scripts/mods/dmf/modules/ui/options/dmf_options_view_settings") local ButtonPassTemplates = require("scripts/ui/pass_templates/button_pass_templates") local CheckboxPassTemplates = require("scripts/ui/pass_templates/checkbox_pass_templates") diff --git a/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions.lua b/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions.lua index 304ce16..47a17e4 100644 --- a/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions.lua +++ b/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions.lua @@ -1,6 +1,6 @@ local dmf = get_mod("DMF") -local _view_settings = dmf:dofile("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_settings") +local _view_settings = dmf:dofile("scripts/mods/dmf/modules/ui/options/dmf_options_view_settings") local ScrollbarPassTemplates = require("scripts/ui/pass_templates/scrollbar_pass_templates") local UIFontSettings = require("scripts/managers/ui/ui_font_settings") diff --git a/scripts/mods/dmf/modules/ui/options/mod_options.lua b/scripts/mods/dmf/modules/ui/options/mod_options.lua index 37b289b..dce3694 100644 --- a/scripts/mods/dmf/modules/ui/options/mod_options.lua +++ b/scripts/mods/dmf/modules/ui/options/mod_options.lua @@ -568,10 +568,10 @@ end dmf.initialize_dmf_options_view = function () - dmf:add_require_path("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view") - dmf:add_require_path("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions") - dmf:add_require_path("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_settings") - dmf:add_require_path("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints") + dmf:add_require_path("scripts/mods/dmf/modules/ui/options/dmf_options_view") + dmf:add_require_path("scripts/mods/dmf/modules/ui/options/dmf_options_view_definitions") + dmf:add_require_path("scripts/mods/dmf/modules/ui/options/dmf_options_view_settings") + dmf:add_require_path("scripts/mods/dmf/modules/ui/options/dmf_options_view_content_blueprints") dmf:register_view({ view_name = "dmf_options_view", @@ -586,7 +586,7 @@ dmf.initialize_dmf_options_view = function () load_always = true, load_in_hub = true, package = "packages/ui/views/options_view/options_view", - path = "dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view", + path = "scripts/mods/dmf/modules/ui/options/dmf_options_view", state_bound = true, enter_sound_events = { "wwise/events/ui/play_ui_enter_short" @@ -607,7 +607,7 @@ dmf.initialize_dmf_options_view = function () } }) - dmf:dofile("dmf/scripts/mods/dmf/modules/ui/options/dmf_options_view") + dmf:dofile("scripts/mods/dmf/modules/ui/options/dmf_options_view") end -- ####################################################################################################################