diff --git a/changelog b/changelog new file mode 100644 index 0000000..e69de29 diff --git a/squad-mats.lua b/squad-mats.lua index bcba9ae..5b4329b 100644 --- a/squad-mats.lua +++ b/squad-mats.lua @@ -8,6 +8,7 @@ dlstatus = require("moonloader").download_status function main() if not isSampLoaded() or not isSampfuncsLoaded() then return end while not isSampAvailable() do wait(0) end + lua_thread.create(script_update.main) repeat wait(0) until sampGetCurrentServerName() ~= "SA-MP" repeat wait(0) until sampGetCurrentServerName():find("Samp%-Rp.Ru") or sampGetCurrentServerName():find("SRP") local server = getSampRpServerName() @@ -22,6 +23,9 @@ function main() addChatMessage("Установлен новый ID сквада: "..config.data.squad_id) end end) + sampRegisterChatCommand("test",function(para) + dialog.reshow() + end) wait(-1) end @@ -125,13 +129,13 @@ dialog.reshow = function() raknetBitStreamWriteInt16(bs, dialog.id) raknetBitStreamWriteInt8(bs, 2) raknetBitStreamWriteInt8(bs, 4) - raknetBitStreamWriteString(bs, "Меню") + raknetBitStreamWriteString(bs, Utf8ToAnsi("Меню")) raknetBitStreamWriteInt8(bs, 7) - raknetBitStreamWriteString(bs, "Выбрать") + raknetBitStreamWriteString(bs, Utf8ToAnsi("Выбрать")) raknetBitStreamWriteInt8(bs, 7) - raknetBitStreamWriteString(bs, "Закрыть") + raknetBitStreamWriteString(bs, Utf8ToAnsi("Закрыть")) raknetBitStreamWriteInt8(bs, string.len(text)) - raknetBitStreamWriteString(bs, text) + raknetBitStreamWriteString(bs, Utf8ToAnsi(text)) raknetEmulRpcReceiveBitStream(61,bs) raknetDeleteBitStream(bs) end @@ -142,7 +146,7 @@ function sampev.onServerMessage(color, message) local weapon = message:match("%[Офис%]{FFFFFF} Вы взяли {00FFBF}(.+) %(%d+ .+%) {FFFFFF}с оружейного шкафа офиса!") config.data.mats = config.data.mats + counter.weapon[weapon] config.save(config.data) - dialog.reshow() + --lua_thread.create(dialog.reshow) end if message == " Операция выполнена" and os.time() - counter.reset <= 2 then addChatMessage("Счетчик материалов обнулен!") @@ -154,7 +158,6 @@ function sampev.onServerMessage(color, message) end end function sampev.onShowDialog(dialogId, style, title, button1, button2, text) - addChatMessage(style) if title == "Меню" and text == dialog.text then dialog.id = dialogId text = dialog.convertText(text) @@ -251,6 +254,226 @@ function addChatMessage(text) sampAddChatMessage(tag..text, 0xFFFFFFFF) end +-->> UPDATE +function openURL(url, fpath) + local text = "" + local file_download = false + local download_final = false + + + if doesFileExist(fpath) then + os.remove(fpath) + end + + downloadUrlToFile(url, fpath, function(id, status, p1, p2) + if status == dlstatus.STATUS_ENDDOWNLOADDATA then + file_download = true + end + if status == dlstatus.STATUSEX_ENDDOWNLOAD then + download_final = true + end + end + ) + + repeat + wait(1000) + until download_final or file_download + + if file_download then + local f = io.open(fpath, "r") + if f then + text = f:read("*a") + io.close(f) + end + os.remove(fpath) + end + + if (text:find("Not found") and not text:find('"Not found"')) or text == "" then + text = "" + addChatMessage("Не удалось скачать обновление по ссылке:") + addChatMessage(url) + end + + return text +end + +script_update = { + version_url = "http://git.deadpoo.net/rubin/squad-mats/raw/branch/master/version", + script_url = "http://git.deadpoo.net/rubin/squad-mats/raw/branch/master/squad-mats.lua", + changelog_url = "http://git.deadpoo.net/rubin/squad-mats/raw/branch/master/changelog", + address_ini = string.format("rubin-mods-updates\\%s.ini", thisScript().name), + main = function() + if not doesDirectoryExist("moonloader\\config\\rubin-mods-updates") then + createDirectory("moonloader\\config\\rubin-mods-updates") + end + local ini = inicfg.load({ + settings = { + check_update = true, + auto_update = true, + server_version = "" + } + }, script_update.address_ini) + ini.settings.version_url = script_update.version_url + ini.settings.script_url = script_update.script_url + ini.settings.changelog_url = script_update.changelog_url + ini.settings.version = thisScript().version + ini.settings.script_name = thisScript().name + local command = (thisScript().name:gsub(" ", "").."-update"):lower() + sampRegisterChatCommand(command, script_update.command) + if ini.settings.check_update or ini.settings.auto_update then + local fpath = os.tmpname() + local result, text = pcall(openURL, script_update.version_url, fpath) + if result then + ini.settings.server_version = text + if text ~= "" and not string.find(text, thisScript().version) then + addChatMessage( string.format("Вышла новая версия '%s'. Текущая: '%s'", text, thisScript().version) ) + if ini.settings.auto_update then + addChatMessage( string.format("Автообновление скрипта включено. Процесс запущен!") ) + script_update.command() + else + addChatMessage( string.format("Автообновление скрипта выключено. Обновить самому: /%s", command) ) + end + end + end + end + inicfg.save(ini, script_update.address_ini) + script_update.menu.init() + end, + command = function() + lua_thread.create(function() + local fpath = os.tmpname() + local result, text = pcall(openURL, script_update.version_url, fpath) + if result then + if text ~= "" and not string.find(text, thisScript().version) then + addChatMessage( string.format("Вышла новая версия '%s'. Текущая: '%s'", text, thisScript().version) ) + local fpath = os.tmpname() + local result, text = pcall(openURL, script_update.script_url, fpath) + if result and text ~= "" and text:find(thisScript().name:gsub("%-", "%%-")) then + local file, error = io.open(thisScript().path, "w") + if file ~= nil then + file:write(text) + file:flush() + io.close(file) + addChatMessage("Обновление завершено, скрипт перезагружен!") + wait(500) + thisScript():reload() + end + end + else + addChatMessage("У Вас установлена последняя версия!") + end + end + end) + end, + menu = { + dialog = {}, + ini = {}, + init = function() + if not sampIsChatCommandDefined("rubin-mods") then + sampAddChatMessage("{667dff}[RUBIN MODS]{FFFFFF} Управление обновлениями скриптов: /rubin-mods", 0xFFFFFFFF) + sampRegisterChatCommand("rubin-mods",script_update.menu.show) + while true do + wait(0) + local result, button, list, input = sampHasDialogRespond(2160) + if result and button == 1 then + if script_update.menu.ini[list+1] ~= nil and script_update.menu.dialog[list+1] ~= nil then + script_update.menu.dialog[list+1](script_update.menu.ini[list+1]) + end + end + local result, button, list, input = sampHasDialogRespond(2162) + if result then + if button == 1 then + if script_update.menu2.text[list+1] ~= nil and script_update.menu2.dialog[list+1] ~= nil then + script_update.menu2.dialog[list+1]() + end + else + script_update.menu.show() + end + end + local result, button, list, input = sampHasDialogRespond(2161) + if result then + script_update.menu2.show(script_update.menu2.data) + end + end + end + end, + show = function() + script_update.menu.dialog = {} + script_update.menu.ini = {} + local text = "" + if doesDirectoryExist("moonloader\\config\\rubin-mods-updates") then + local FileHandle, FileName = findFirstFile("moonloader\\config\\rubin-mods-updates\\*") + while FileName ~= nil do + if FileName ~= nil and FileName ~= ".." and FileName ~= "." and FileName:find("%.ini") then + local address = string.format("moonloader\\config\\rubin-mods-updates\\%s", FileName) + if doesFileExist(address) then + local ini = inicfg.load({}, address) + script_update.menu.ini[#script_update.menu.ini+1] = address + text = string.format("%s%s\n", text, string.format("%s\t%s%s", ini.settings.script_name, (ini.settings.version == ini.settings.server_version and "{59fc30}" or "{ff0000}"),ini.settings.version)) + script_update.menu.dialog[#script_update.menu.dialog+1] = function(data) + script_update.menu2.show(data) + end + end + end + FileName = findNextFile(FileHandle) + end + findClose(FileHandle) + else + text = "Не найдена директория:\t\n moonloader\\config\\rubin-mods-updates\t" + end + sampShowDialog(2160,"Обновление скриптов: Rubin Mods","Скрипт\tВерсия\n"..text,"Выбрать","Закрыть",5) + end + }, + menu2 = { + data = {}, + text = {}, + dialog = {}, + show = function(data) + script_update.menu2.data = data + script_update.menu2.text = {} + script_update.menu2.dialog = {} + if doesFileExist(data) then + local ini = inicfg.load({}, data) + script_update.menu2.text[#script_update.menu2.text+1] = string.format("Автообновление %s", (ini.settings.auto_update and "{59fc30}ON" or "{ff0000}OFF")) + script_update.menu2.dialog[#script_update.menu2.dialog+1] = function() + ini.settings.auto_update = not ini.settings.auto_update + inicfg.save(ini, data) + script_update.menu2.show(data) + end + if not ini.settings.auto_update then + script_update.menu2.text[#script_update.menu2.text+1] = string.format("Проверять обновления %s", (ini.settings.check_update and "{59fc30}ON" or "{ff0000}OFF")) + script_update.menu2.dialog[#script_update.menu2.dialog+1] = function() + ini.settings.check_update = not ini.settings.check_update + inicfg.save(ini, data) + script_update.menu2.show(data) + end + end + script_update.menu2.text[#script_update.menu2.text+1] = string.format("Последние изменения") + script_update.menu2.dialog[#script_update.menu2.dialog+1] = function() + script_update.changelog(ini.settings.changelog_url, ini.settings.script_name) + end + script_update.menu2.text[#script_update.menu2.text+1] = string.format("Удалить из списка") + script_update.menu2.dialog[#script_update.menu2.dialog+1] = function() + os.remove(data) + script_update.menu.show() + end + local text = "" + for i = 1, #script_update.menu2.text do + text = text..script_update.menu2.text[i].."\n" + end + sampShowDialog(2162,"Настройки обновления для "..ini.settings.script_name,text,"Выбрать","Назад",2) + end + end + }, + changelog = function(url, name) + local fpath = os.tmpname() + local result, text = pcall(openURL, url, fpath) + if result then + sampShowDialog(2161,"Changelog - "..name,text,"Выбрать","Назад",4) + end + end +} + -->> SCRIPT UTF-8 -->> utf8(table path, incoming variables encoding, outcoming variables encoding) -->> table path example { "sampev", "onShowDialog" } diff --git a/version b/version new file mode 100644 index 0000000..ad2e5db --- /dev/null +++ b/version @@ -0,0 +1 @@ +02.02.2023 \ No newline at end of file