bitsquid_dt/Darktide-Mod-Framework
bitsquid_dt/Darktide-Mod-Framework
2
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
Var Dump: 
dumpVar: only available in dev mode
Mailing List

Mutators: moved config to mod data [2]

Browse source 
For some reason not all changes were added to previous commit
This commit is contained in:
bi 2018-05-06 18:39:08 +03:00
parent aeadb94343
commit d8a84d2d76
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
vmf/scripts/mods/vmf/modules/ui/mutators/mutator_manager.lua
View file

@ -65,9 +65,9 @@ end
-- Checks if mutators are compatible both ways -- Checks if mutators are compatible both ways
local function is_compatible(mutator, other_mutator) local function is_compatible(mutator, other_mutator)
local config = vmf.get_mutator_config(mutator) local config = mutator:get_config()
local name = mutator:get_name() local name = mutator:get_name()
local other_config = vmf.get_mutator_config(other_mutator) local other_config = other_mutator:get_config()
local other_name = other_mutator:get_name() local other_name = other_mutator:get_name()
local incompatible_specifically = ( local incompatible_specifically = (
@ -106,7 +106,7 @@ end
-- Called after mutator is enabled -- Called after mutator is enabled
local function on_enabled(mutator) local function on_enabled(mutator)
local config = vmf.get_mutator_config(mutator) local config = mutator:get_config()
_DICE_MANAGER.addDice(config.dice) _DICE_MANAGER.addDice(config.dice)
_SET_LOBBY_DATA() _SET_LOBBY_DATA()
print("[MUTATORS] Enabled " .. mutator:get_name() .. " (" .. tostring(get_index(_MUTATORS, mutator)) .. ")") print("[MUTATORS] Enabled " .. mutator:get_name() .. " (" .. tostring(get_index(_MUTATORS, mutator)) .. ")")
@ -116,7 +116,7 @@ end
-- Called after mutator is disabled -- Called after mutator is disabled
local function on_disabled(mutator) local function on_disabled(mutator)
local config = vmf.get_mutator_config(mutator) local config = mutator:get_config()
_DICE_MANAGER.removeDice(config.dice) _DICE_MANAGER.removeDice(config.dice)
_SET_LOBBY_DATA() _SET_LOBBY_DATA()
print("[MUTATORS] Disabled " .. mutator:get_name() .. " (" .. tostring(get_index(_MUTATORS, mutator)) .. ")") print("[MUTATORS] Disabled " .. mutator:get_name() .. " (" .. tostring(get_index(_MUTATORS, mutator)) .. ")")
@ -219,7 +219,7 @@ function vmf.add_mutator_titles_to_string(_mutators, str, separator, short)
local replace = nil local replace = nil
for _, mutator in ipairs(_mutators) do for _, mutator in ipairs(_mutators) do
local config = vmf.get_mutator_config(mutator) local config = mutator:get_config()
local added_name = (short and config.short_title or mutator:get_readable_name()) local added_name = (short and config.short_title or mutator:get_readable_name())
if config.title_placement == "before" then if config.title_placement == "before" then
if before then if before then
@ -295,7 +295,7 @@ end
-- Only checks difficulty -- Only checks difficulty
-- M, G -- M, G
function vmf.mutator_supports_current_difficulty(mutator) function vmf.mutator_supports_current_difficulty(mutator)
local mutator_difficulty_levels = vmf.get_mutator_config(mutator).difficulty_levels local mutator_difficulty_levels = mutator:get_config().difficulty_levels
local actual_difficulty = Managers.state and Managers.state.difficulty:get_difficulty() local actual_difficulty = Managers.state and Managers.state.difficulty:get_difficulty()
local right_difficulty = not actual_difficulty or table.contains(mutator_difficulty_levels, actual_difficulty) local right_difficulty = not actual_difficulty or table.contains(mutator_difficulty_levels, actual_difficulty)
@ -314,12 +314,6 @@ function vmf.mutator_supports_current_difficulty(mutator)
return (map_view_active and right_unapplied_difficulty) or (not map_view_active and right_difficulty) return (map_view_active and right_unapplied_difficulty) or (not map_view_active and right_difficulty)
end end
-- Returns the config object for mutator from _MUTATORS_CONFIG
-- M, G
function vmf.get_mutator_config(mutator)
return mutator:get_config()
end
-- ########## -- ##########
-- # GLOBAL # -- # GLOBAL #
-- ########## -- ##########
@ -333,7 +327,6 @@ function vmf.register_mod_as_mutator(mod, config)
-- Save config -- Save config
mod._data.config = table.clone(_DEFAULT_CONFIG) mod._data.config = table.clone(_DEFAULT_CONFIG)
local _config = mod:get_config() local _config = mod:get_config()
for k, _ in pairs(_config) do for k, _ in pairs(_config) do
if config[k] ~= nil then if config[k] ~= nil then