Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 1.8.9 #111

Merged
merged 3 commits into from
Jun 11, 2022
Merged

Version 1.8.9 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
326d87d
Make the generator self-sufficient
Jun 11, 2022
b644651
Change language loader
Jun 11, 2022
4a0d719
Upgrade version to > 1.8.9
Jun 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lua/background_npcs_core/global/sv_dynamic_movement_mesh.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
async.Add('bgNPC_MovementMapDynamicGenerator', function(yield, wait)
async.AddDedic('bgNPC_MovementMapDynamicGenerator', function(yield, wait)
local cvar_bgn_generator_restict = GetConVar('bgn_enable_dynamic_nodes_only_when_mesh_not_exists')
local cvar_bgn_dynamic_nodes = GetConVar('bgn_dynamic_nodes')
local cvar_bgn_dynamic_nodes_type = GetConVar('bgn_dynamic_nodes_type')
Expand Down Expand Up @@ -294,7 +294,7 @@ async.Add('bgNPC_MovementMapDynamicGenerator', function(yield, wait)
PassYield()
end

-- MsgN('New mesh generated')
-- player.GetAll()[1]:ChatPrint('New mesh generated' .. ' ' .. tostring(CurTime()))

BGN_NODE:SetMap(map_points)

Expand Down
7 changes: 4 additions & 3 deletions lua/background_npcs_core/tool_options/cl_lang.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
local ru_lang = include('lang/cl_ru.lua')
local en_lang = include('lang/cl_en.lua')
local lang = slib.language({
['default'] = bgNPC.LANGUAGES['english'],
['russian'] = bgNPC.LANGUAGES['russian']
})

local lang = GetConVar('cl_language'):GetString() == 'russian' and ru_lang or en_lang
for k, v in pairs(lang) do
language.Add(k, v)
end
6 changes: 4 additions & 2 deletions ...und_npcs_core/tool_options/lang/cl_en.lua → ...und_npcs_core/tool_options/lang/sh_en.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
local target_directory = 'background_npcs_core/tool_options/lang/'
slib.usingDirectory(target_directory .. 'en')
slib.usingDirectory(target_directory .. 'en', nil, true)

if SERVER then return end

local lang = {}

Expand All @@ -12,4 +14,4 @@ table.Merge(lang, include(target_directory .. 'en/cl_workshop.lua'))
table.Merge(lang, include(target_directory .. 'en/cl_actors.lua'))
table.Merge(lang, include(target_directory .. 'en/cl_modules.lua'))

return lang
bgNPC.LANGUAGES['english'] = lang
6 changes: 4 additions & 2 deletions ...und_npcs_core/tool_options/lang/cl_ru.lua → ...und_npcs_core/tool_options/lang/sh_ru.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
local target_directory = 'background_npcs_core/tool_options/lang/'
slib.usingDirectory(target_directory .. 'ru')
slib.usingDirectory(target_directory .. 'ru', nil, true)

if SERVER then return end

local lang = {}

Expand All @@ -12,4 +14,4 @@ table.Merge(lang, include(target_directory .. 'ru/cl_workshop.lua'))
table.Merge(lang, include(target_directory .. 'ru/cl_actors.lua'))
table.Merge(lang, include(target_directory .. 'ru/cl_modules.lua'))

return lang
bgNPC.LANGUAGES['russian'] = lang
7 changes: 4 additions & 3 deletions lua/slib_autoloader/sh_background_npcs.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ if SERVER then
end

bgNPC = {}
bgNPC.VERSION = '1.8.8'
bgNPC.VERSION = '1.8.9'

-- Do not change -------------
bgNPC.LANGUAGES = {}
bgNPC.cfg = {}
bgNPC.actors = {}
bgNPC.factors = {}
Expand Down Expand Up @@ -195,8 +196,8 @@ local function ExecutableScripts()
script:using('states/sv_random_gesture.lua')
script:using('states/sh_dance.lua')

script:using('tool_options/lang/cl_en.lua')
script:using('tool_options/lang/cl_ru.lua')
script:using('tool_options/lang/sh_en.lua')
script:using('tool_options/lang/sh_ru.lua')
script:using('tool_options/cl_lang.lua')

script:using('tool_options/cl_bgn_settings_menu.lua')
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.8.8
1.8.9