From bac68063d6a53cea42875db0fd4773b2becc824a Mon Sep 17 00:00:00 2001 From: Arwent Date: Fri, 1 Jul 2022 09:22:54 +0200 Subject: [PATCH 1/9] adding custom_depot scripts --- data/ui_scripts/custom_depot/__init__.lua | 86 ++ .../custom_depot/depot_override.lua | 283 +++++++ data/ui_scripts/custom_depot/dkjson.lua | 748 ++++++++++++++++++ .../custom_depot/scoreboard_override.lua | 35 + 4 files changed, 1152 insertions(+) create mode 100644 data/ui_scripts/custom_depot/__init__.lua create mode 100644 data/ui_scripts/custom_depot/depot_override.lua create mode 100644 data/ui_scripts/custom_depot/dkjson.lua create mode 100644 data/ui_scripts/custom_depot/scoreboard_override.lua diff --git a/data/ui_scripts/custom_depot/__init__.lua b/data/ui_scripts/custom_depot/__init__.lua new file mode 100644 index 00000000..3b54e1bf --- /dev/null +++ b/data/ui_scripts/custom_depot/__init__.lua @@ -0,0 +1,86 @@ +local json = require("dkjson") + +custom_depot = { + collection_details_menu = nil, + data = { + currencies = { + [1] = 0, -- LaunchCredits + [2] = 0, -- Credits + [3] = 0, -- Parts + [4] = 0, -- CoDPoints + [5] = 0 -- Bonus + }, + items = {}, + reward_splashes = {} + }, + directory_path = "data/ui_scripts", + file_name = "depot_save.json", + file_path = nil, + functions = {}, + mod_name = "custom_depot" +} + +custom_depot.directory_path = string.format("%s/%s", custom_depot.directory_path, custom_depot.mod_name) +custom_depot.file_path = string.format("%s/%s", custom_depot.directory_path, custom_depot.file_name) + +custom_depot.get_function = function(function_name) + if not function_name or not custom_depot.functions[function_name] then + return nil + end + + return custom_depot.functions[function_name] +end + +custom_depot.functions["save_depot_data"] = function() + io.writefile(custom_depot.file_path, json.encode(custom_depot.data, { + indent = true + }), false) +end + +custom_depot.functions["load_depot_data"] = function() + if not io.directoryexists(custom_depot.directory_path) then + os.execute(string.format("mkdir %s", custom_depot.directory_path)) + end + + if not io.fileexists(custom_depot.file_path) then + custom_depot.get_function("save_depot_data")() + end + + custom_depot.data = json.decode(io.readfile(custom_depot.file_path)) +end + +custom_depot.functions["add_currency"] = function(currency_type, amount) + custom_depot.data.currencies[currency_type] = custom_depot.data.currencies[currency_type] + amount +end + +custom_depot.functions["remove_currency"] = function(currency_type, amount) + custom_depot.data.currencies[currency_type] = custom_depot.data.currencies[currency_type] - amount +end + +custom_depot.functions["get_currency"] = function(currency_type) + if not currency_type or not custom_depot.data.currencies[currency_type] then + return nil + end + + return custom_depot.data.currencies[currency_type] +end + +custom_depot.functions["add_item"] = function(item, value) + custom_depot.data.items[item] = value +end + +custom_depot.functions["has_item"] = function(item) + return custom_depot.data.items[item] ~= nil +end + +custom_depot.functions["add_reward_splash"] = function(item, value) + custom_depot.data.reward_splashes[item] = value +end + +custom_depot.functions["has_reward_splash"] = function(item) + return custom_depot.data.reward_splashes[item] ~= nil +end + +custom_depot.get_function("load_depot_data")() +require("depot_override") +require("scoreboard_override") diff --git a/data/ui_scripts/custom_depot/depot_override.lua b/data/ui_scripts/custom_depot/depot_override.lua new file mode 100644 index 00000000..91fdf5f3 --- /dev/null +++ b/data/ui_scripts/custom_depot/depot_override.lua @@ -0,0 +1,283 @@ +InventoryCurrencyType = { + LaunchCredits = 1, + Credits = 2, + Parts = 3, + CoDPoints = 4, + Bonus = 5, + Max = 6 +} + +GetCurrencyBalance = function(currency_type) + return custom_depot.get_function("get_currency")(currency_type) +end + +Inventory_PurchaseItem_orig = Engine.Inventory_PurchaseItem +Engine.Inventory_PurchaseItem = function(controller, item_guid, unk2) + if not custom_depot.get_function("has_item")(item_guid) then + custom_depot.get_function("add_item")(item_guid, true) + + local item_value = Engine.TableLookup(LootTable.File, LootTable.Cols.GUID, item_guid, LootTable.Cols.Value) + custom_depot.get_function("remove_currency")(InventoryCurrencyType.Parts, item_value) + + custom_depot.get_function("save_depot_data")() + + if custom_depot.collection_details_menu then + custom_depot.collection_details_menu:OnCraftedItem() + end + end + + return Inventory_PurchaseItem_orig(controller, item_guid, unk2) +end + +GetItemLockState_orig = Engine.GetItemLockState +Engine.GetItemLockState = function(controller, item_guid) + if custom_depot.get_function("has_item")(item_guid) then + return "Unlocked", 0, "" + end + + return GetItemLockState_orig(controller, item_guid) +end + +GetItemSet_orig = GetItemSet +GetItemSet = function(item_set_id) + local item_set = GetItemSet_orig(item_set_id) + local items_unlocked = 0 + + for k, v in pairs(item_set.setItems) do + if custom_depot.get_function("has_item")(v.guid) and (not v.isOwned or v.lockState == "Unlocked") then + v.isOwned = true + v.lockState = "Unlocked" + items_unlocked = items_unlocked + 1 + end + end + + if items_unlocked == #item_set.setItems then + if not item_set.completed then + item_set.completed = true + end + + if not custom_depot.get_function("has_item")(item_set.setReward.guid) then + custom_depot.get_function("add_item")(item_set.setReward.guid, true) + custom_depot.get_function("save_depot_data")() + + if custom_depot.collection_details_menu then + custom_depot.collection_details_menu:OnCompletedSet() + end + end + end + + item_set.numOwned = items_unlocked + return item_set +end + +GetItemSets_orig = GetItemSets +GetItemSets = function() + local item_sets = GetItemSets_orig() + local completed_sets = 0 + + for i = 1, #item_sets.seasons do + local seasons_completed_sets = 0 + local sets = item_sets.seasons[i].sets + local rewardData = item_sets.seasons[i].rewardData + + for i = 1, #sets do + if sets[i].completed then + completed_sets = completed_sets + 1 + seasons_completed_sets = seasons_completed_sets + 1 + end + end + + if item_sets.seasons[i].completedSets == #sets then + rewardData.setReward.isOwned = true + rewardData.setReward.lockState = "Unlocked" + rewardData.completed = true + + if not custom_depot.get_function("has_item")(rewardData.setReward.guid) then + custom_depot.get_function("add_item")(rewardData.setReward.guid, true) + custom_depot.get_function("save_depot_data")() + end + end + + item_sets.seasons[i].completedSets = seasons_completed_sets + end + + for k, v in pairs(item_sets.itemToSetMap) do + local items_unlocked = 0 + + for i = 1, #v.setItems do + if custom_depot.get_function("has_item")(v.setItems[i].guid) and + (not v.setItems[i].isOwned or v.setItems[i].lockState == "Unlocked") then + v.setItems[i].isOwned = true + v.setItems[i].lockState = "Unlocked" + items_unlocked = items_unlocked + 1 + end + end + + if items_unlocked == #v.setItems then + if not v.completed then + v.completed = true + completed_sets = completed_sets + 1 + end + + if not custom_depot.get_function("has_item")(v.setReward.guid) then + custom_depot.get_function("add_item")(v.setReward.guid, true) + custom_depot.get_function("save_depot_data")() + end + end + + v.numOwned = items_unlocked + end + + item_sets.completedSets = completed_sets + return item_sets +end + +IsContentPromoUnlocked_orig = IsContentPromoUnlocked +IsContentPromoUnlocked = function() + return true +end + +TryShowCollectionCompleted_orig = TryShowCollectionCompleted +TryShowCollectionCompleted = function(controller, reward_data, unk1) + if reward_data.completed then + if not custom_depot.get_function("has_reward_splash")(reward_data.setReward.guid) then + LUI.FlowManager.RequestAddMenu(nil, "MPDepotCollectionRewardSplash", true, controller, false, { + collectionData = reward_data + }) + + if collection_details_menu then + custom_depot.collection_details_menu:OnCompletedSet() + end + + custom_depot.get_function("add_reward_splash")(reward_data.setReward.guid, true) + custom_depot.get_function("save_depot_data")() + end + + return true + else + return false + end +end + +TryShowSeasonCompleted_orig = TryShowSeasonCompleted +TryShowSeasonCompleted = function(controller, reward_data, unk1) + if reward_data.completed then + if not custom_depot.get_function("has_reward_splash")(reward_data.setReward.guid) then + LUI.FlowManager.RequestAddMenu(nil, "MPDepotCollectionRewardSplash", true, controller, false, { + collectionData = reward_data + }) + + if custom_depot.collection_details_menu then + custom_depot.collection_details_menu:OnCompletedSet() + end + + custom_depot.get_function("add_reward_splash")(reward_data.setReward.guid, true) + custom_depot.get_function("save_depot_data")() + end + + return true + else + return false + end +end + +MPDepotCollectionDetailsMenu_orig = LUI.MenuBuilder.m_types_build["MPDepotCollectionDetailsMenu"] +MPDepotCollectionDetailsMenu = function(unk1, unk2) + custom_depot.collection_details_menu = MPDepotCollectionDetailsMenu_orig(unk1, unk2) + return custom_depot.collection_details_menu +end +LUI.MenuBuilder.m_types_build["MPDepotCollectionDetailsMenu"] = MPDepotCollectionDetailsMenu + +MPDepotOpenLootMenu_orig = LUI.MenuBuilder.m_types_build["MPDepotOpenLootMenu"] +MPDepotOpenLootMenu = function(unk1, unk2) + local open_loot_menu = MPDepotOpenLootMenu_orig(unk1, unk2) + + local supply_drop_orig = open_loot_menu.m_eventHandlers["supply_drop"] + open_loot_menu:registerEventHandler("supply_drop", function(f48_arg0, f48_arg1) + f48_arg1.success = true + f48_arg1.transaction = f48_arg0.supplyDropTransaction + f48_arg1.duplicateRefund = false + f48_arg1.items = {} + f48_arg1.currencies = {} + f48_arg1.replacements = {} + f48_arg1.cards = {} + + local supply_drop_price = LUI.MPDepot.GetSupplyDropPrice(f48_arg0.supplyDropType) + custom_depot.get_function("remove_currency")(supply_drop_price.type, supply_drop_price.amount) + custom_depot.get_function("save_depot_data")() + + for i = 1, math.random(1, 3) do + local items_list = LUI.MPLootDropsBase.GetGenericItemList(x, LUI.MPDepot.LootDropsData[LUI.MPDepot + .SuppyDropLootStream[unk2.crateType]].lootTableColName) + local random_item = items_list[math.random(#items_list)] + + print(random_item.inventoryItemType ~= Cac.InventoryItemType.Loot) + print(random_item.inventoryItemType) + while random_item.inventoryItemType ~= Cac.InventoryItemType.Loot do + random_item = items_list[math.random(#items_list)] + end + + if random_item then + f48_arg1.items[i] = random_item.guid + end + end + + for i = 1, #f48_arg1.items do + if not custom_depot.get_function("has_item")(f48_arg1.items[i]) then + custom_depot.get_function("add_item")(f48_arg1.items[i], true) + else + local dismantled_amount = math.random(1, 1000) + + table.insert(f48_arg1.replacements, { + item_index = i, + currency = { + amount = dismantled_amount + } + }) + + custom_depot.get_function("add_currency")(InventoryCurrencyType.Parts, dismantled_amount) + end + end + + custom_depot.get_function("save_depot_data")() + supply_drop_orig(f48_arg0, f48_arg1) + end) + + local slow_purchase_transfer_orig = open_loot_menu.m_eventHandlers["slow_purchase_transfer"] + open_loot_menu:registerEventHandler("slow_purchase_transfer", function(f33_arg0, f33_arg1) + local f33_local0 = 0 + if f33_arg0.slowPurchaseTimer then + f33_arg0.slowPurchaseTimer:close() + f33_arg0.slowPurchaseTimer = nil + end + local f33_local1 = CoD.CreateState(-500, 0, 500, 20, CoD.AnchorTypes.Top) + f33_local1.font = CoD.TextSettings.BodyFont.Font + f33_local1.verticalAlignment = LUI.VerticalAlignment.Top + f33_local1.horizontalAlignment = LUI.HorizontalAlignment.Center + f33_local1.color = Colors.mw1_green + f33_local1.alpha = 1 + f33_arg0.slowPurchaseText = LUI.UIText.new(f33_local1) + f33_arg0:addElement(f33_arg0.slowPurchaseText) + f33_arg0.slowPurchaseText:setText(Engine.Localize("@DEPOT_TRANSFER_IN_PROGRESS_DOT")) + f33_arg0.slowPurchaseText.textState = 1 + f33_arg0.slowPurchaseText:registerEventHandler("update_slow_purchase_text", f0_local30) + f33_arg0.slowPurchaseText:addElement(LUI.UITimer.new(1000, "update_slow_purchase_text")) + local f33_local2 = LUI.MenuBuilder.BuildRegisteredType("progressBar") + f33_local2:registerAnimationState("default", { + topAnchor = false, + bottomAnchor = true, + leftAnchor = false, + rightAnchor = false, + top = 0, + height = 40 + }) + f33_local2:animateToState("default") + f33_arg0.slowPurchaseText:addElement(f33_local2) + f33_local2:animateFill(f33_local0) + f33_arg0.purchaseTimeoutTimer = LUI.UITimer.new(f33_local0, "abort_purchase_transfer", nil, true) + f33_arg0:addElement(f33_arg0.purchaseTimeoutTimer) + end) + + return open_loot_menu +end +LUI.MenuBuilder.m_types_build["MPDepotOpenLootMenu"] = MPDepotOpenLootMenu diff --git a/data/ui_scripts/custom_depot/dkjson.lua b/data/ui_scripts/custom_depot/dkjson.lua new file mode 100644 index 00000000..fadb5efd --- /dev/null +++ b/data/ui_scripts/custom_depot/dkjson.lua @@ -0,0 +1,748 @@ +-- Module options: +local always_use_lpeg = false +local register_global_module_table = false +local global_module_name = 'json' + +--[==[ + +David Kolf's JSON module for Lua 5.1 - 5.4 + +Version 2.6 + + +For the documentation see the corresponding readme.txt or visit +. + +You can contact the author by sending an e-mail to 'david' at the +domain 'dkolf.de'. + + +Copyright (C) 2010-2021 David Heiko Kolf + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--]==] + +-- global dependencies: +local pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset = + pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset +local error, require, pcall, select = error, require, pcall, select +local floor, huge = math.floor, math.huge +local strrep, gsub, strsub, strbyte, strchar, strfind, strlen, strformat = + string.rep, string.gsub, string.sub, string.byte, string.char, + string.find, string.len, string.format +local strmatch = string.match +local concat = table.concat + +local json = { version = "dkjson 2.6" } + +local jsonlpeg = {} + +if register_global_module_table then + if always_use_lpeg then + _G[global_module_name] = jsonlpeg + else + _G[global_module_name] = json + end +end + +local _ENV = nil -- blocking globals in Lua 5.2 and later + +pcall (function() + -- Enable access to blocked metatables. + -- Don't worry, this module doesn't change anything in them. + local debmeta = require "debug".getmetatable + if debmeta then getmetatable = debmeta end +end) + +json.null = setmetatable ({}, { + __tojson = function () return "null" end +}) + +local function isarray (tbl) + local max, n, arraylen = 0, 0, 0 + for k,v in pairs (tbl) do + if k == 'n' and type(v) == 'number' then + arraylen = v + if v > max then + max = v + end + else + if type(k) ~= 'number' or k < 1 or floor(k) ~= k then + return false + end + if k > max then + max = k + end + n = n + 1 + end + end + if max > 10 and max > arraylen and max > n * 2 then + return false -- don't create an array with too many holes + end + return true, max +end + +local escapecodes = { + ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f", + ["\n"] = "\\n", ["\r"] = "\\r", ["\t"] = "\\t" +} + +local function escapeutf8 (uchar) + local value = escapecodes[uchar] + if value then + return value + end + local a, b, c, d = strbyte (uchar, 1, 4) + a, b, c, d = a or 0, b or 0, c or 0, d or 0 + if a <= 0x7f then + value = a + elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then + value = (a - 0xc0) * 0x40 + b - 0x80 + elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then + value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80 + elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then + value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80 + else + return "" + end + if value <= 0xffff then + return strformat ("\\u%.4x", value) + elseif value <= 0x10ffff then + -- encode as UTF-16 surrogate pair + value = value - 0x10000 + local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400) + return strformat ("\\u%.4x\\u%.4x", highsur, lowsur) + else + return "" + end +end + +local function fsub (str, pattern, repl) + -- gsub always builds a new string in a buffer, even when no match + -- exists. First using find should be more efficient when most strings + -- don't contain the pattern. + if strfind (str, pattern) then + return gsub (str, pattern, repl) + else + return str + end +end + +local function quotestring (value) + -- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js + value = fsub (value, "[%z\1-\31\"\\\127]", escapeutf8) + if strfind (value, "[\194\216\220\225\226\239]") then + value = fsub (value, "\194[\128-\159\173]", escapeutf8) + value = fsub (value, "\216[\128-\132]", escapeutf8) + value = fsub (value, "\220\143", escapeutf8) + value = fsub (value, "\225\158[\180\181]", escapeutf8) + value = fsub (value, "\226\128[\140-\143\168-\175]", escapeutf8) + value = fsub (value, "\226\129[\160-\175]", escapeutf8) + value = fsub (value, "\239\187\191", escapeutf8) + value = fsub (value, "\239\191[\176-\191]", escapeutf8) + end + return "\"" .. value .. "\"" +end +json.quotestring = quotestring + +local function replace(str, o, n) + local i, j = strfind (str, o, 1, true) + if i then + return strsub(str, 1, i-1) .. n .. strsub(str, j+1, -1) + else + return str + end +end + +-- locale independent num2str and str2num functions +local decpoint, numfilter + +local function updatedecpoint () + decpoint = strmatch(tostring(0.5), "([^05+])") + -- build a filter that can be used to remove group separators + numfilter = "[^0-9%-%+eE" .. gsub(decpoint, "[%^%$%(%)%%%.%[%]%*%+%-%?]", "%%%0") .. "]+" +end + +updatedecpoint() + +local function num2str (num) + return replace(fsub(tostring(num), numfilter, ""), decpoint, ".") +end + +local function str2num (str) + local num = tonumber(replace(str, ".", decpoint)) + if not num then + updatedecpoint() + num = tonumber(replace(str, ".", decpoint)) + end + return num +end + +local function addnewline2 (level, buffer, buflen) + buffer[buflen+1] = "\n" + buffer[buflen+2] = strrep (" ", level) + buflen = buflen + 2 + return buflen +end + +function json.addnewline (state) + if state.indent then + state.bufferlen = addnewline2 (state.level or 0, + state.buffer, state.bufferlen or #(state.buffer)) + end +end + +local encode2 -- forward declaration + +local function addpair (key, value, prev, indent, level, buffer, buflen, tables, globalorder, state) + local kt = type (key) + if kt ~= 'string' and kt ~= 'number' then + return nil, "type '" .. kt .. "' is not supported as a key by JSON." + end + if prev then + buflen = buflen + 1 + buffer[buflen] = "," + end + if indent then + buflen = addnewline2 (level, buffer, buflen) + end + buffer[buflen+1] = quotestring (key) + buffer[buflen+2] = ":" + return encode2 (value, indent, level, buffer, buflen + 2, tables, globalorder, state) +end + +local function appendcustom(res, buffer, state) + local buflen = state.bufferlen + if type (res) == 'string' then + buflen = buflen + 1 + buffer[buflen] = res + end + return buflen +end + +local function exception(reason, value, state, buffer, buflen, defaultmessage) + defaultmessage = defaultmessage or reason + local handler = state.exception + if not handler then + return nil, defaultmessage + else + state.bufferlen = buflen + local ret, msg = handler (reason, value, state, defaultmessage) + if not ret then return nil, msg or defaultmessage end + return appendcustom(ret, buffer, state) + end +end + +function json.encodeexception(reason, value, state, defaultmessage) + return quotestring("<" .. defaultmessage .. ">") +end + +encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, state) + local valtype = type (value) + local valmeta = getmetatable (value) + valmeta = type (valmeta) == 'table' and valmeta -- only tables + local valtojson = valmeta and valmeta.__tojson + if valtojson then + if tables[value] then + return exception('reference cycle', value, state, buffer, buflen) + end + tables[value] = true + state.bufferlen = buflen + local ret, msg = valtojson (value, state) + if not ret then return exception('custom encoder failed', value, state, buffer, buflen, msg) end + tables[value] = nil + buflen = appendcustom(ret, buffer, state) + elseif value == nil then + buflen = buflen + 1 + buffer[buflen] = "null" + elseif valtype == 'number' then + local s + if value ~= value or value >= huge or -value >= huge then + -- This is the behaviour of the original JSON implementation. + s = "null" + else + s = num2str (value) + end + buflen = buflen + 1 + buffer[buflen] = s + elseif valtype == 'boolean' then + buflen = buflen + 1 + buffer[buflen] = value and "true" or "false" + elseif valtype == 'string' then + buflen = buflen + 1 + buffer[buflen] = quotestring (value) + elseif valtype == 'table' then + if tables[value] then + return exception('reference cycle', value, state, buffer, buflen) + end + tables[value] = true + level = level + 1 + local isa, n = isarray (value) + if n == 0 and valmeta and valmeta.__jsontype == 'object' then + isa = false + end + local msg + if isa then -- JSON array + buflen = buflen + 1 + buffer[buflen] = "[" + for i = 1, n do + buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + if i < n then + buflen = buflen + 1 + buffer[buflen] = "," + end + end + buflen = buflen + 1 + buffer[buflen] = "]" + else -- JSON object + local prev = false + buflen = buflen + 1 + buffer[buflen] = "{" + local order = valmeta and valmeta.__jsonorder or globalorder + if order then + local used = {} + n = #order + for i = 1, n do + local k = order[i] + local v = value[k] + if v ~= nil then + used[k] = true + buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + prev = true -- add a seperator before the next element + end + end + for k,v in pairs (value) do + if not used[k] then + buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + prev = true -- add a seperator before the next element + end + end + else -- unordered + for k,v in pairs (value) do + buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) + if not buflen then return nil, msg end + prev = true -- add a seperator before the next element + end + end + if indent then + buflen = addnewline2 (level - 1, buffer, buflen) + end + buflen = buflen + 1 + buffer[buflen] = "}" + end + tables[value] = nil + else + return exception ('unsupported type', value, state, buffer, buflen, + "type '" .. valtype .. "' is not supported by JSON.") + end + return buflen +end + +function json.encode (value, state) + state = state or {} + local oldbuffer = state.buffer + local buffer = oldbuffer or {} + state.buffer = buffer + updatedecpoint() + local ret, msg = encode2 (value, state.indent, state.level or 0, + buffer, state.bufferlen or 0, state.tables or {}, state.keyorder, state) + if not ret then + error (msg, 2) + elseif oldbuffer == buffer then + state.bufferlen = ret + return true + else + state.bufferlen = nil + state.buffer = nil + return concat (buffer) + end +end + +local function loc (str, where) + local line, pos, linepos = 1, 1, 0 + while true do + pos = strfind (str, "\n", pos, true) + if pos and pos < where then + line = line + 1 + linepos = pos + pos = pos + 1 + else + break + end + end + return "line " .. line .. ", column " .. (where - linepos) +end + +local function unterminated (str, what, where) + return nil, strlen (str) + 1, "unterminated " .. what .. " at " .. loc (str, where) +end + +local function scanwhite (str, pos) + while true do + pos = strfind (str, "%S", pos) + if not pos then return nil end + local sub2 = strsub (str, pos, pos + 1) + if sub2 == "\239\187" and strsub (str, pos + 2, pos + 2) == "\191" then + -- UTF-8 Byte Order Mark + pos = pos + 3 + elseif sub2 == "//" then + pos = strfind (str, "[\n\r]", pos + 2) + if not pos then return nil end + elseif sub2 == "/*" then + pos = strfind (str, "*/", pos + 2) + if not pos then return nil end + pos = pos + 2 + else + return pos + end + end +end + +local escapechars = { + ["\""] = "\"", ["\\"] = "\\", ["/"] = "/", ["b"] = "\b", ["f"] = "\f", + ["n"] = "\n", ["r"] = "\r", ["t"] = "\t" +} + +local function unichar (value) + if value < 0 then + return nil + elseif value <= 0x007f then + return strchar (value) + elseif value <= 0x07ff then + return strchar (0xc0 + floor(value/0x40), + 0x80 + (floor(value) % 0x40)) + elseif value <= 0xffff then + return strchar (0xe0 + floor(value/0x1000), + 0x80 + (floor(value/0x40) % 0x40), + 0x80 + (floor(value) % 0x40)) + elseif value <= 0x10ffff then + return strchar (0xf0 + floor(value/0x40000), + 0x80 + (floor(value/0x1000) % 0x40), + 0x80 + (floor(value/0x40) % 0x40), + 0x80 + (floor(value) % 0x40)) + else + return nil + end +end + +local function scanstring (str, pos) + local lastpos = pos + 1 + local buffer, n = {}, 0 + while true do + local nextpos = strfind (str, "[\"\\]", lastpos) + if not nextpos then + return unterminated (str, "string", pos) + end + if nextpos > lastpos then + n = n + 1 + buffer[n] = strsub (str, lastpos, nextpos - 1) + end + if strsub (str, nextpos, nextpos) == "\"" then + lastpos = nextpos + 1 + break + else + local escchar = strsub (str, nextpos + 1, nextpos + 1) + local value + if escchar == "u" then + value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16) + if value then + local value2 + if 0xD800 <= value and value <= 0xDBff then + -- we have the high surrogate of UTF-16. Check if there is a + -- low surrogate escaped nearby to combine them. + if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then + value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16) + if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then + value = (value - 0xD800) * 0x400 + (value2 - 0xDC00) + 0x10000 + else + value2 = nil -- in case it was out of range for a low surrogate + end + end + end + value = value and unichar (value) + if value then + if value2 then + lastpos = nextpos + 12 + else + lastpos = nextpos + 6 + end + end + end + end + if not value then + value = escapechars[escchar] or escchar + lastpos = nextpos + 2 + end + n = n + 1 + buffer[n] = value + end + end + if n == 1 then + return buffer[1], lastpos + elseif n > 1 then + return concat (buffer), lastpos + else + return "", lastpos + end +end + +local scanvalue -- forward declaration + +local function scantable (what, closechar, str, startpos, nullval, objectmeta, arraymeta) + local len = strlen (str) + local tbl, n = {}, 0 + local pos = startpos + 1 + if what == 'object' then + setmetatable (tbl, objectmeta) + else + setmetatable (tbl, arraymeta) + end + while true do + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + local char = strsub (str, pos, pos) + if char == closechar then + return tbl, pos + 1 + end + local val1, err + val1, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) + if err then return nil, pos, err end + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + char = strsub (str, pos, pos) + if char == ":" then + if val1 == nil then + return nil, pos, "cannot use nil as table index (at " .. loc (str, pos) .. ")" + end + pos = scanwhite (str, pos + 1) + if not pos then return unterminated (str, what, startpos) end + local val2 + val2, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) + if err then return nil, pos, err end + tbl[val1] = val2 + pos = scanwhite (str, pos) + if not pos then return unterminated (str, what, startpos) end + char = strsub (str, pos, pos) + else + n = n + 1 + tbl[n] = val1 + end + if char == "," then + pos = pos + 1 + end + end +end + +scanvalue = function (str, pos, nullval, objectmeta, arraymeta) + pos = pos or 1 + pos = scanwhite (str, pos) + if not pos then + return nil, strlen (str) + 1, "no valid JSON value (reached the end)" + end + local char = strsub (str, pos, pos) + if char == "{" then + return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta) + elseif char == "[" then + return scantable ('array', "]", str, pos, nullval, objectmeta, arraymeta) + elseif char == "\"" then + return scanstring (str, pos) + else + local pstart, pend = strfind (str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos) + if pstart then + local number = str2num (strsub (str, pstart, pend)) + if number then + return number, pend + 1 + end + end + pstart, pend = strfind (str, "^%a%w*", pos) + if pstart then + local name = strsub (str, pstart, pend) + if name == "true" then + return true, pend + 1 + elseif name == "false" then + return false, pend + 1 + elseif name == "null" then + return nullval, pend + 1 + end + end + return nil, pos, "no valid JSON value at " .. loc (str, pos) + end +end + +local function optionalmetatables(...) + if select("#", ...) > 0 then + return ... + else + return {__jsontype = 'object'}, {__jsontype = 'array'} + end +end + +function json.decode (str, pos, nullval, ...) + local objectmeta, arraymeta = optionalmetatables(...) + return scanvalue (str, pos, nullval, objectmeta, arraymeta) +end + +function json.use_lpeg () + local g = require ("lpeg") + + if g.version() == "0.11" then + error "due to a bug in LPeg 0.11, it cannot be used for JSON matching" + end + + local pegmatch = g.match + local P, S, R = g.P, g.S, g.R + + local function ErrorCall (str, pos, msg, state) + if not state.msg then + state.msg = msg .. " at " .. loc (str, pos) + state.pos = pos + end + return false + end + + local function Err (msg) + return g.Cmt (g.Cc (msg) * g.Carg (2), ErrorCall) + end + + local function ErrorUnterminatedCall (str, pos, what, state) + return ErrorCall (str, pos - 1, "unterminated " .. what, state) + end + + local SingleLineComment = P"//" * (1 - S"\n\r")^0 + local MultiLineComment = P"/*" * (1 - P"*/")^0 * P"*/" + local Space = (S" \n\r\t" + P"\239\187\191" + SingleLineComment + MultiLineComment)^0 + + local function ErrUnterminated (what) + return g.Cmt (g.Cc (what) * g.Carg (2), ErrorUnterminatedCall) + end + + local PlainChar = 1 - S"\"\\\n\r" + local EscapeSequence = (P"\\" * g.C (S"\"\\/bfnrt" + Err "unsupported escape sequence")) / escapechars + local HexDigit = R("09", "af", "AF") + local function UTF16Surrogate (match, pos, high, low) + high, low = tonumber (high, 16), tonumber (low, 16) + if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then + return true, unichar ((high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000) + else + return false + end + end + local function UTF16BMP (hex) + return unichar (tonumber (hex, 16)) + end + local U16Sequence = (P"\\u" * g.C (HexDigit * HexDigit * HexDigit * HexDigit)) + local UnicodeEscape = g.Cmt (U16Sequence * U16Sequence, UTF16Surrogate) + U16Sequence/UTF16BMP + local Char = UnicodeEscape + EscapeSequence + PlainChar + local String = P"\"" * (g.Cs (Char ^ 0) * P"\"" + ErrUnterminated "string") + local Integer = P"-"^(-1) * (P"0" + (R"19" * R"09"^0)) + local Fractal = P"." * R"09"^0 + local Exponent = (S"eE") * (S"+-")^(-1) * R"09"^1 + local Number = (Integer * Fractal^(-1) * Exponent^(-1))/str2num + local Constant = P"true" * g.Cc (true) + P"false" * g.Cc (false) + P"null" * g.Carg (1) + local SimpleValue = Number + String + Constant + local ArrayContent, ObjectContent + + -- The functions parsearray and parseobject parse only a single value/pair + -- at a time and store them directly to avoid hitting the LPeg limits. + local function parsearray (str, pos, nullval, state) + local obj, cont + local start = pos + local npos + local t, nt = {}, 0 + repeat + obj, cont, npos = pegmatch (ArrayContent, str, pos, nullval, state) + if cont == 'end' then + return ErrorUnterminatedCall (str, start, "array", state) + end + pos = npos + if cont == 'cont' or cont == 'last' then + nt = nt + 1 + t[nt] = obj + end + until cont ~= 'cont' + return pos, setmetatable (t, state.arraymeta) + end + + local function parseobject (str, pos, nullval, state) + local obj, key, cont + local start = pos + local npos + local t = {} + repeat + key, obj, cont, npos = pegmatch (ObjectContent, str, pos, nullval, state) + if cont == 'end' then + return ErrorUnterminatedCall (str, start, "object", state) + end + pos = npos + if cont == 'cont' or cont == 'last' then + t[key] = obj + end + until cont ~= 'cont' + return pos, setmetatable (t, state.objectmeta) + end + + local Array = P"[" * g.Cmt (g.Carg(1) * g.Carg(2), parsearray) + local Object = P"{" * g.Cmt (g.Carg(1) * g.Carg(2), parseobject) + local Value = Space * (Array + Object + SimpleValue) + local ExpectedValue = Value + Space * Err "value expected" + local ExpectedKey = String + Err "key expected" + local End = P(-1) * g.Cc'end' + local ErrInvalid = Err "invalid JSON" + ArrayContent = (Value * Space * (P"," * g.Cc'cont' + P"]" * g.Cc'last'+ End + ErrInvalid) + g.Cc(nil) * (P"]" * g.Cc'empty' + End + ErrInvalid)) * g.Cp() + local Pair = g.Cg (Space * ExpectedKey * Space * (P":" + Err "colon expected") * ExpectedValue) + ObjectContent = (g.Cc(nil) * g.Cc(nil) * P"}" * g.Cc'empty' + End + (Pair * Space * (P"," * g.Cc'cont' + P"}" * g.Cc'last' + End + ErrInvalid) + ErrInvalid)) * g.Cp() + local DecodeValue = ExpectedValue * g.Cp () + + jsonlpeg.version = json.version + jsonlpeg.encode = json.encode + jsonlpeg.null = json.null + jsonlpeg.quotestring = json.quotestring + jsonlpeg.addnewline = json.addnewline + jsonlpeg.encodeexception = json.encodeexception + jsonlpeg.using_lpeg = true + + function jsonlpeg.decode (str, pos, nullval, ...) + local state = {} + state.objectmeta, state.arraymeta = optionalmetatables(...) + local obj, retpos = pegmatch (DecodeValue, str, pos, nullval, state) + if state.msg then + return nil, state.pos, state.msg + else + return obj, retpos + end + end + + -- cache result of this function: + json.use_lpeg = function () return jsonlpeg end + jsonlpeg.use_lpeg = json.use_lpeg + + return jsonlpeg +end + +if always_use_lpeg then + return json.use_lpeg() +end + +return json + diff --git a/data/ui_scripts/custom_depot/scoreboard_override.lua b/data/ui_scripts/custom_depot/scoreboard_override.lua new file mode 100644 index 00000000..6f52b62e --- /dev/null +++ b/data/ui_scripts/custom_depot/scoreboard_override.lua @@ -0,0 +1,35 @@ +local player_score = 0 +local player_old_score = 0 + +Scoreboard_orig = LUI.MenuBuilder.m_types_build["scoreboard"] +Scoreboard = function(unk1, unk2) + local scoreboard = Scoreboard_orig(unk1, unk2) + + scoreboard:registerOmnvarHandler("ui_round_end", function(f22_arg0, f22_arg1) + if GameX.IsRankedMatch() then + local gamemode = GameX.GetGameMode() + local player_stats = Game.GetPlayerScoreInfoAtRank(Game.GetPlayerTeam(), Game.GetPlayerScoreRanking()) + + if Engine.GetDvarInt(string.format("scr_%s_halftime", gamemode)) == 1 or IsGameTypeRoundBased(gamemode) or + gamemode == "conf" or gamemode == "war" then + player_score = player_stats.score + else + player_score = player_stats.extrascore0 + end + + local currency_gain = math.floor((player_score - player_old_score) * 10 / 100) + + if currency_gain == 0 then + return + end + + custom_depot.get_function("add_currency")(InventoryCurrencyType.Parts, currency_gain) + + player_old_score = player_score + custom_depot.get_function("save_depot_data")() + end + end) + + return scoreboard +end +LUI.MenuBuilder.m_types_build["scoreboard"] = Scoreboard From 870963d2df0af4cb1ef19276765008fad4fefc4a Mon Sep 17 00:00:00 2001 From: Arwent Date: Sun, 3 Jul 2022 00:56:21 +0200 Subject: [PATCH 2/9] wip agreement --- data/ui_scripts/custom_depot/__init__.lua | 23 ++++++++++- .../custom_depot/depot_override.lua | 39 ++++++++++++++++++- data/ui_scripts/custom_depot/mod_eula.lua | 18 +++++++++ 3 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 data/ui_scripts/custom_depot/mod_eula.lua diff --git a/data/ui_scripts/custom_depot/__init__.lua b/data/ui_scripts/custom_depot/__init__.lua index 3b54e1bf..42ad29d7 100644 --- a/data/ui_scripts/custom_depot/__init__.lua +++ b/data/ui_scripts/custom_depot/__init__.lua @@ -11,7 +11,9 @@ custom_depot = { [5] = 0 -- Bonus }, items = {}, - reward_splashes = {} + reward_splashes = {}, + has_accepted_mod_eula = false, + has_seen_mod_eula = false, }, directory_path = "data/ui_scripts", file_name = "depot_save.json", @@ -81,6 +83,25 @@ custom_depot.functions["has_reward_splash"] = function(item) return custom_depot.data.reward_splashes[item] ~= nil end +custom_depot.functions["has_accepted_mod_eula"] = function() + return custom_depot.data.has_accepted_mod_eula +end + +custom_depot.functions["set_has_accepted_mod_eula"] = function(value) + custom_depot.data.has_accepted_mod_eula = value + custom_depot.get_function("save_depot_data")() +end + +custom_depot.functions["has_seen_mod_eula"] = function() + return custom_depot.data.has_seen_mod_eula +end + +custom_depot.functions["set_has_seen_mod_eula"] = function(value) + custom_depot.data.has_seen_mod_eula = value + custom_depot.get_function("save_depot_data")() +end + custom_depot.get_function("load_depot_data")() +require("mod_eula") require("depot_override") require("scoreboard_override") diff --git a/data/ui_scripts/custom_depot/depot_override.lua b/data/ui_scripts/custom_depot/depot_override.lua index 91fdf5f3..9f74f651 100644 --- a/data/ui_scripts/custom_depot/depot_override.lua +++ b/data/ui_scripts/custom_depot/depot_override.lua @@ -145,7 +145,7 @@ TryShowCollectionCompleted = function(controller, reward_data, unk1) collectionData = reward_data }) - if collection_details_menu then + if custom_depot.collection_details_menu then custom_depot.collection_details_menu:OnCompletedSet() end @@ -281,3 +281,40 @@ MPDepotOpenLootMenu = function(unk1, unk2) return open_loot_menu end LUI.MenuBuilder.m_types_build["MPDepotOpenLootMenu"] = MPDepotOpenLootMenu + +AddLootDropTabSelector_orig = LUI.MPDepotBase.AddLootDropTabSelector +LUI.MPDepotBase.AddLootDropTabSelector = function(unk1, unk2) + if not custom_depot.get_function("has_accepted_mod_eula")() then + local item_sets = GetItemSets() + + unk1:AddButtonWithInfo("depot_collections", "@DEPOT_COLLECTIONS", "MPDepotCollectionsMenu", nil, nil, + Engine.Localize("@MPUI_X_SLASH_Y", item_sets.completedSets, item_sets.numSets)) + + unk1:AddButtonWithInfo("depot_armory", "@DEPOT_ARMORY", "MPDepotArmoryMenu") + return + end + + AddLootDropTabSelector_orig(unk1, unk2) +end + +MPDepotMenu_orig = LUI.MenuBuilder.m_types_build["MPDepotMenu"] +MPDepotMenu = function(unk1, unk2) + local depot_menu = MPDepotMenu_orig(unk1, unk2) + + if not custom_depot.get_function("has_seen_mod_eula")() then + LUI.FlowManager.RequestAddMenu(nil, "mod_eula", true, 0, false, { + acceptCallback = function() + custom_depot.get_function("set_has_accepted_mod_eula")(true) + custom_depot.get_function("set_has_seen_mod_eula")(true) + LUI.FlowManager.RequestLeaveMenu(depot_menu) + end, + declineCallback = function() + custom_depot.get_function("set_has_accepted_mod_eula")(false) + custom_depot.get_function("set_has_seen_mod_eula")(true) + end + }) + end + + return depot_menu +end +LUI.MenuBuilder.m_types_build["MPDepotMenu"] = MPDepotMenu diff --git a/data/ui_scripts/custom_depot/mod_eula.lua b/data/ui_scripts/custom_depot/mod_eula.lua new file mode 100644 index 00000000..084e100c --- /dev/null +++ b/data/ui_scripts/custom_depot/mod_eula.lua @@ -0,0 +1,18 @@ +game:addlocalizedstring("MOD_EULA_1", + "SOMETHING TO WRITE HERE, HELLO WORLD, I GUESS I WILL NEED SOMEONE TO WRITE THIS TEXT BECAUSE MY ENGLISH IS SHITTY AS FUCK.") +game:addlocalizedstring("MOD_EULA_2", + "YEAH, WE HAVE NOW THIS \"EULA\" TO ACCEPT FOR SOME COUNTRIES, AND H1-MOD STAFF IS NOT RESPONSIBLE, OK? BYE NOW.") + +local mod_eula = function(unk1, unk2) + return LUI.EULABase.new(CoD.CreateState(0, 0, 0, 0, CoD.AnchorTypes.All), { + textStrings = LUI.EULABase.CreateTextStrings("@MOD_EULA_", 2), + declineCallback = function(unk3) + unk2.declineCallback(unk3) + end, + acceptCallback = function(unk4) + unk2.acceptCallback(unk4) + end + }) +end + +LUI.MenuBuilder.registerPopupType("mod_eula", mod_eula) From 9d1f7fb1b6d1611880035ca27c296704d95bf8c3 Mon Sep 17 00:00:00 2001 From: Arwent Date: Sun, 3 Jul 2022 11:27:56 +0200 Subject: [PATCH 3/9] eula draft --- data/ui_scripts/custom_depot/mod_eula.lua | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/data/ui_scripts/custom_depot/mod_eula.lua b/data/ui_scripts/custom_depot/mod_eula.lua index 084e100c..31bae99b 100644 --- a/data/ui_scripts/custom_depot/mod_eula.lua +++ b/data/ui_scripts/custom_depot/mod_eula.lua @@ -1,11 +1,16 @@ -game:addlocalizedstring("MOD_EULA_1", - "SOMETHING TO WRITE HERE, HELLO WORLD, I GUESS I WILL NEED SOMEONE TO WRITE THIS TEXT BECAUSE MY ENGLISH IS SHITTY AS FUCK.") -game:addlocalizedstring("MOD_EULA_2", - "YEAH, WE HAVE NOW THIS \"EULA\" TO ACCEPT FOR SOME COUNTRIES, AND H1-MOD STAFF IS NOT RESPONSIBLE, OK? BYE NOW.") +game:addlocalizedstring("CUSTOM_DEPOT_EULA_1", "Dear User,") +game:addlocalizedstring("CUSTOM_DEPOT_EULA_2", + "By using this feature, you acknowledge that you are over 18 years old, and that any sort of chance games / gambling are allowed in your country (even if they do not involve real money).") +game:addlocalizedstring("CUSTOM_DEPOT_EULA_3", + "The H1-Mod team is not responsible if you break the law within your country, and the sole responsibility will be upon you to respect the same.") +game:addlocalizedstring("CUSTOM_DEPOT_EULA_4", + "The H1-Mod team will never include real money transactions within the modified systems. The only way to get currency, should you wish to, is by playing the game.") +game:addlocalizedstring("CUSTOM_DEPOT_EULA_5", "Best Regards,") +game:addlocalizedstring("CUSTOM_DEPOT_EULA_6", "The H1-Mod Team.") local mod_eula = function(unk1, unk2) return LUI.EULABase.new(CoD.CreateState(0, 0, 0, 0, CoD.AnchorTypes.All), { - textStrings = LUI.EULABase.CreateTextStrings("@MOD_EULA_", 2), + textStrings = LUI.EULABase.CreateTextStrings("@CUSTOM_DEPOT_EULA_", 6), declineCallback = function(unk3) unk2.declineCallback(unk3) end, From fb2611fa8dd00f7dea71aed2079937e155715d06 Mon Sep 17 00:00:00 2001 From: Arwent Date: Sun, 3 Jul 2022 18:26:15 +0200 Subject: [PATCH 4/9] fix for embedded json, and move save to h1-mod folder --- data/ui_scripts/custom_depot/__init__.lua | 26 ++++++++----------- .../custom_depot/depot_override.lua | 2 -- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/data/ui_scripts/custom_depot/__init__.lua b/data/ui_scripts/custom_depot/__init__.lua index 42ad29d7..4e5f287f 100644 --- a/data/ui_scripts/custom_depot/__init__.lua +++ b/data/ui_scripts/custom_depot/__init__.lua @@ -1,28 +1,24 @@ -local json = require("dkjson") - custom_depot = { collection_details_menu = nil, data = { currencies = { - [1] = 0, -- LaunchCredits - [2] = 0, -- Credits - [3] = 0, -- Parts - [4] = 0, -- CoDPoints - [5] = 0 -- Bonus + ["1"] = 0, -- LaunchCredits + ["2"] = 0, -- Credits + ["3"] = 0, -- Parts + ["4"] = 0, -- CoDPoints + ["5"] = 0 -- Bonus }, items = {}, reward_splashes = {}, has_accepted_mod_eula = false, has_seen_mod_eula = false, }, - directory_path = "data/ui_scripts", + directory_path = "h1-mod", file_name = "depot_save.json", file_path = nil, - functions = {}, - mod_name = "custom_depot" + functions = {} } -custom_depot.directory_path = string.format("%s/%s", custom_depot.directory_path, custom_depot.mod_name) custom_depot.file_path = string.format("%s/%s", custom_depot.directory_path, custom_depot.file_name) custom_depot.get_function = function(function_name) @@ -52,19 +48,19 @@ custom_depot.functions["load_depot_data"] = function() end custom_depot.functions["add_currency"] = function(currency_type, amount) - custom_depot.data.currencies[currency_type] = custom_depot.data.currencies[currency_type] + amount + custom_depot.data.currencies[tostring(currency_type)] = custom_depot.data.currencies[tostring(currency_type)] + amount end custom_depot.functions["remove_currency"] = function(currency_type, amount) - custom_depot.data.currencies[currency_type] = custom_depot.data.currencies[currency_type] - amount + custom_depot.data.currencies[tostring(currency_type)] = custom_depot.data.currencies[tostring(currency_type)] - amount end custom_depot.functions["get_currency"] = function(currency_type) - if not currency_type or not custom_depot.data.currencies[currency_type] then + if not currency_type or not custom_depot.data.currencies[tostring(currency_type)] then return nil end - return custom_depot.data.currencies[currency_type] + return custom_depot.data.currencies[tostring(currency_type)] end custom_depot.functions["add_item"] = function(item, value) diff --git a/data/ui_scripts/custom_depot/depot_override.lua b/data/ui_scripts/custom_depot/depot_override.lua index 9f74f651..88073ff3 100644 --- a/data/ui_scripts/custom_depot/depot_override.lua +++ b/data/ui_scripts/custom_depot/depot_override.lua @@ -211,8 +211,6 @@ MPDepotOpenLootMenu = function(unk1, unk2) .SuppyDropLootStream[unk2.crateType]].lootTableColName) local random_item = items_list[math.random(#items_list)] - print(random_item.inventoryItemType ~= Cac.InventoryItemType.Loot) - print(random_item.inventoryItemType) while random_item.inventoryItemType ~= Cac.InventoryItemType.Loot do random_item = items_list[math.random(#items_list)] end From 4f80d402a1ade58a9e91c8936f16c61fce171a30 Mon Sep 17 00:00:00 2001 From: mjkzy Date: Sun, 3 Jul 2022 11:30:12 -0500 Subject: [PATCH 5/9] remove dk json + use io createdirectory --- data/ui_scripts/custom_depot/__init__.lua | 2 +- data/ui_scripts/custom_depot/dkjson.lua | 748 ---------------------- 2 files changed, 1 insertion(+), 749 deletions(-) delete mode 100644 data/ui_scripts/custom_depot/dkjson.lua diff --git a/data/ui_scripts/custom_depot/__init__.lua b/data/ui_scripts/custom_depot/__init__.lua index 4e5f287f..a0d4b9fa 100644 --- a/data/ui_scripts/custom_depot/__init__.lua +++ b/data/ui_scripts/custom_depot/__init__.lua @@ -37,7 +37,7 @@ end custom_depot.functions["load_depot_data"] = function() if not io.directoryexists(custom_depot.directory_path) then - os.execute(string.format("mkdir %s", custom_depot.directory_path)) + io.createdirectory(custom_depot.directory_path) end if not io.fileexists(custom_depot.file_path) then diff --git a/data/ui_scripts/custom_depot/dkjson.lua b/data/ui_scripts/custom_depot/dkjson.lua deleted file mode 100644 index fadb5efd..00000000 --- a/data/ui_scripts/custom_depot/dkjson.lua +++ /dev/null @@ -1,748 +0,0 @@ --- Module options: -local always_use_lpeg = false -local register_global_module_table = false -local global_module_name = 'json' - ---[==[ - -David Kolf's JSON module for Lua 5.1 - 5.4 - -Version 2.6 - - -For the documentation see the corresponding readme.txt or visit -. - -You can contact the author by sending an e-mail to 'david' at the -domain 'dkolf.de'. - - -Copyright (C) 2010-2021 David Heiko Kolf - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ---]==] - --- global dependencies: -local pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset = - pairs, type, tostring, tonumber, getmetatable, setmetatable, rawset -local error, require, pcall, select = error, require, pcall, select -local floor, huge = math.floor, math.huge -local strrep, gsub, strsub, strbyte, strchar, strfind, strlen, strformat = - string.rep, string.gsub, string.sub, string.byte, string.char, - string.find, string.len, string.format -local strmatch = string.match -local concat = table.concat - -local json = { version = "dkjson 2.6" } - -local jsonlpeg = {} - -if register_global_module_table then - if always_use_lpeg then - _G[global_module_name] = jsonlpeg - else - _G[global_module_name] = json - end -end - -local _ENV = nil -- blocking globals in Lua 5.2 and later - -pcall (function() - -- Enable access to blocked metatables. - -- Don't worry, this module doesn't change anything in them. - local debmeta = require "debug".getmetatable - if debmeta then getmetatable = debmeta end -end) - -json.null = setmetatable ({}, { - __tojson = function () return "null" end -}) - -local function isarray (tbl) - local max, n, arraylen = 0, 0, 0 - for k,v in pairs (tbl) do - if k == 'n' and type(v) == 'number' then - arraylen = v - if v > max then - max = v - end - else - if type(k) ~= 'number' or k < 1 or floor(k) ~= k then - return false - end - if k > max then - max = k - end - n = n + 1 - end - end - if max > 10 and max > arraylen and max > n * 2 then - return false -- don't create an array with too many holes - end - return true, max -end - -local escapecodes = { - ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\f"] = "\\f", - ["\n"] = "\\n", ["\r"] = "\\r", ["\t"] = "\\t" -} - -local function escapeutf8 (uchar) - local value = escapecodes[uchar] - if value then - return value - end - local a, b, c, d = strbyte (uchar, 1, 4) - a, b, c, d = a or 0, b or 0, c or 0, d or 0 - if a <= 0x7f then - value = a - elseif 0xc0 <= a and a <= 0xdf and b >= 0x80 then - value = (a - 0xc0) * 0x40 + b - 0x80 - elseif 0xe0 <= a and a <= 0xef and b >= 0x80 and c >= 0x80 then - value = ((a - 0xe0) * 0x40 + b - 0x80) * 0x40 + c - 0x80 - elseif 0xf0 <= a and a <= 0xf7 and b >= 0x80 and c >= 0x80 and d >= 0x80 then - value = (((a - 0xf0) * 0x40 + b - 0x80) * 0x40 + c - 0x80) * 0x40 + d - 0x80 - else - return "" - end - if value <= 0xffff then - return strformat ("\\u%.4x", value) - elseif value <= 0x10ffff then - -- encode as UTF-16 surrogate pair - value = value - 0x10000 - local highsur, lowsur = 0xD800 + floor (value/0x400), 0xDC00 + (value % 0x400) - return strformat ("\\u%.4x\\u%.4x", highsur, lowsur) - else - return "" - end -end - -local function fsub (str, pattern, repl) - -- gsub always builds a new string in a buffer, even when no match - -- exists. First using find should be more efficient when most strings - -- don't contain the pattern. - if strfind (str, pattern) then - return gsub (str, pattern, repl) - else - return str - end -end - -local function quotestring (value) - -- based on the regexp "escapable" in https://github.com/douglascrockford/JSON-js - value = fsub (value, "[%z\1-\31\"\\\127]", escapeutf8) - if strfind (value, "[\194\216\220\225\226\239]") then - value = fsub (value, "\194[\128-\159\173]", escapeutf8) - value = fsub (value, "\216[\128-\132]", escapeutf8) - value = fsub (value, "\220\143", escapeutf8) - value = fsub (value, "\225\158[\180\181]", escapeutf8) - value = fsub (value, "\226\128[\140-\143\168-\175]", escapeutf8) - value = fsub (value, "\226\129[\160-\175]", escapeutf8) - value = fsub (value, "\239\187\191", escapeutf8) - value = fsub (value, "\239\191[\176-\191]", escapeutf8) - end - return "\"" .. value .. "\"" -end -json.quotestring = quotestring - -local function replace(str, o, n) - local i, j = strfind (str, o, 1, true) - if i then - return strsub(str, 1, i-1) .. n .. strsub(str, j+1, -1) - else - return str - end -end - --- locale independent num2str and str2num functions -local decpoint, numfilter - -local function updatedecpoint () - decpoint = strmatch(tostring(0.5), "([^05+])") - -- build a filter that can be used to remove group separators - numfilter = "[^0-9%-%+eE" .. gsub(decpoint, "[%^%$%(%)%%%.%[%]%*%+%-%?]", "%%%0") .. "]+" -end - -updatedecpoint() - -local function num2str (num) - return replace(fsub(tostring(num), numfilter, ""), decpoint, ".") -end - -local function str2num (str) - local num = tonumber(replace(str, ".", decpoint)) - if not num then - updatedecpoint() - num = tonumber(replace(str, ".", decpoint)) - end - return num -end - -local function addnewline2 (level, buffer, buflen) - buffer[buflen+1] = "\n" - buffer[buflen+2] = strrep (" ", level) - buflen = buflen + 2 - return buflen -end - -function json.addnewline (state) - if state.indent then - state.bufferlen = addnewline2 (state.level or 0, - state.buffer, state.bufferlen or #(state.buffer)) - end -end - -local encode2 -- forward declaration - -local function addpair (key, value, prev, indent, level, buffer, buflen, tables, globalorder, state) - local kt = type (key) - if kt ~= 'string' and kt ~= 'number' then - return nil, "type '" .. kt .. "' is not supported as a key by JSON." - end - if prev then - buflen = buflen + 1 - buffer[buflen] = "," - end - if indent then - buflen = addnewline2 (level, buffer, buflen) - end - buffer[buflen+1] = quotestring (key) - buffer[buflen+2] = ":" - return encode2 (value, indent, level, buffer, buflen + 2, tables, globalorder, state) -end - -local function appendcustom(res, buffer, state) - local buflen = state.bufferlen - if type (res) == 'string' then - buflen = buflen + 1 - buffer[buflen] = res - end - return buflen -end - -local function exception(reason, value, state, buffer, buflen, defaultmessage) - defaultmessage = defaultmessage or reason - local handler = state.exception - if not handler then - return nil, defaultmessage - else - state.bufferlen = buflen - local ret, msg = handler (reason, value, state, defaultmessage) - if not ret then return nil, msg or defaultmessage end - return appendcustom(ret, buffer, state) - end -end - -function json.encodeexception(reason, value, state, defaultmessage) - return quotestring("<" .. defaultmessage .. ">") -end - -encode2 = function (value, indent, level, buffer, buflen, tables, globalorder, state) - local valtype = type (value) - local valmeta = getmetatable (value) - valmeta = type (valmeta) == 'table' and valmeta -- only tables - local valtojson = valmeta and valmeta.__tojson - if valtojson then - if tables[value] then - return exception('reference cycle', value, state, buffer, buflen) - end - tables[value] = true - state.bufferlen = buflen - local ret, msg = valtojson (value, state) - if not ret then return exception('custom encoder failed', value, state, buffer, buflen, msg) end - tables[value] = nil - buflen = appendcustom(ret, buffer, state) - elseif value == nil then - buflen = buflen + 1 - buffer[buflen] = "null" - elseif valtype == 'number' then - local s - if value ~= value or value >= huge or -value >= huge then - -- This is the behaviour of the original JSON implementation. - s = "null" - else - s = num2str (value) - end - buflen = buflen + 1 - buffer[buflen] = s - elseif valtype == 'boolean' then - buflen = buflen + 1 - buffer[buflen] = value and "true" or "false" - elseif valtype == 'string' then - buflen = buflen + 1 - buffer[buflen] = quotestring (value) - elseif valtype == 'table' then - if tables[value] then - return exception('reference cycle', value, state, buffer, buflen) - end - tables[value] = true - level = level + 1 - local isa, n = isarray (value) - if n == 0 and valmeta and valmeta.__jsontype == 'object' then - isa = false - end - local msg - if isa then -- JSON array - buflen = buflen + 1 - buffer[buflen] = "[" - for i = 1, n do - buflen, msg = encode2 (value[i], indent, level, buffer, buflen, tables, globalorder, state) - if not buflen then return nil, msg end - if i < n then - buflen = buflen + 1 - buffer[buflen] = "," - end - end - buflen = buflen + 1 - buffer[buflen] = "]" - else -- JSON object - local prev = false - buflen = buflen + 1 - buffer[buflen] = "{" - local order = valmeta and valmeta.__jsonorder or globalorder - if order then - local used = {} - n = #order - for i = 1, n do - local k = order[i] - local v = value[k] - if v ~= nil then - used[k] = true - buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) - prev = true -- add a seperator before the next element - end - end - for k,v in pairs (value) do - if not used[k] then - buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) - if not buflen then return nil, msg end - prev = true -- add a seperator before the next element - end - end - else -- unordered - for k,v in pairs (value) do - buflen, msg = addpair (k, v, prev, indent, level, buffer, buflen, tables, globalorder, state) - if not buflen then return nil, msg end - prev = true -- add a seperator before the next element - end - end - if indent then - buflen = addnewline2 (level - 1, buffer, buflen) - end - buflen = buflen + 1 - buffer[buflen] = "}" - end - tables[value] = nil - else - return exception ('unsupported type', value, state, buffer, buflen, - "type '" .. valtype .. "' is not supported by JSON.") - end - return buflen -end - -function json.encode (value, state) - state = state or {} - local oldbuffer = state.buffer - local buffer = oldbuffer or {} - state.buffer = buffer - updatedecpoint() - local ret, msg = encode2 (value, state.indent, state.level or 0, - buffer, state.bufferlen or 0, state.tables or {}, state.keyorder, state) - if not ret then - error (msg, 2) - elseif oldbuffer == buffer then - state.bufferlen = ret - return true - else - state.bufferlen = nil - state.buffer = nil - return concat (buffer) - end -end - -local function loc (str, where) - local line, pos, linepos = 1, 1, 0 - while true do - pos = strfind (str, "\n", pos, true) - if pos and pos < where then - line = line + 1 - linepos = pos - pos = pos + 1 - else - break - end - end - return "line " .. line .. ", column " .. (where - linepos) -end - -local function unterminated (str, what, where) - return nil, strlen (str) + 1, "unterminated " .. what .. " at " .. loc (str, where) -end - -local function scanwhite (str, pos) - while true do - pos = strfind (str, "%S", pos) - if not pos then return nil end - local sub2 = strsub (str, pos, pos + 1) - if sub2 == "\239\187" and strsub (str, pos + 2, pos + 2) == "\191" then - -- UTF-8 Byte Order Mark - pos = pos + 3 - elseif sub2 == "//" then - pos = strfind (str, "[\n\r]", pos + 2) - if not pos then return nil end - elseif sub2 == "/*" then - pos = strfind (str, "*/", pos + 2) - if not pos then return nil end - pos = pos + 2 - else - return pos - end - end -end - -local escapechars = { - ["\""] = "\"", ["\\"] = "\\", ["/"] = "/", ["b"] = "\b", ["f"] = "\f", - ["n"] = "\n", ["r"] = "\r", ["t"] = "\t" -} - -local function unichar (value) - if value < 0 then - return nil - elseif value <= 0x007f then - return strchar (value) - elseif value <= 0x07ff then - return strchar (0xc0 + floor(value/0x40), - 0x80 + (floor(value) % 0x40)) - elseif value <= 0xffff then - return strchar (0xe0 + floor(value/0x1000), - 0x80 + (floor(value/0x40) % 0x40), - 0x80 + (floor(value) % 0x40)) - elseif value <= 0x10ffff then - return strchar (0xf0 + floor(value/0x40000), - 0x80 + (floor(value/0x1000) % 0x40), - 0x80 + (floor(value/0x40) % 0x40), - 0x80 + (floor(value) % 0x40)) - else - return nil - end -end - -local function scanstring (str, pos) - local lastpos = pos + 1 - local buffer, n = {}, 0 - while true do - local nextpos = strfind (str, "[\"\\]", lastpos) - if not nextpos then - return unterminated (str, "string", pos) - end - if nextpos > lastpos then - n = n + 1 - buffer[n] = strsub (str, lastpos, nextpos - 1) - end - if strsub (str, nextpos, nextpos) == "\"" then - lastpos = nextpos + 1 - break - else - local escchar = strsub (str, nextpos + 1, nextpos + 1) - local value - if escchar == "u" then - value = tonumber (strsub (str, nextpos + 2, nextpos + 5), 16) - if value then - local value2 - if 0xD800 <= value and value <= 0xDBff then - -- we have the high surrogate of UTF-16. Check if there is a - -- low surrogate escaped nearby to combine them. - if strsub (str, nextpos + 6, nextpos + 7) == "\\u" then - value2 = tonumber (strsub (str, nextpos + 8, nextpos + 11), 16) - if value2 and 0xDC00 <= value2 and value2 <= 0xDFFF then - value = (value - 0xD800) * 0x400 + (value2 - 0xDC00) + 0x10000 - else - value2 = nil -- in case it was out of range for a low surrogate - end - end - end - value = value and unichar (value) - if value then - if value2 then - lastpos = nextpos + 12 - else - lastpos = nextpos + 6 - end - end - end - end - if not value then - value = escapechars[escchar] or escchar - lastpos = nextpos + 2 - end - n = n + 1 - buffer[n] = value - end - end - if n == 1 then - return buffer[1], lastpos - elseif n > 1 then - return concat (buffer), lastpos - else - return "", lastpos - end -end - -local scanvalue -- forward declaration - -local function scantable (what, closechar, str, startpos, nullval, objectmeta, arraymeta) - local len = strlen (str) - local tbl, n = {}, 0 - local pos = startpos + 1 - if what == 'object' then - setmetatable (tbl, objectmeta) - else - setmetatable (tbl, arraymeta) - end - while true do - pos = scanwhite (str, pos) - if not pos then return unterminated (str, what, startpos) end - local char = strsub (str, pos, pos) - if char == closechar then - return tbl, pos + 1 - end - local val1, err - val1, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) - if err then return nil, pos, err end - pos = scanwhite (str, pos) - if not pos then return unterminated (str, what, startpos) end - char = strsub (str, pos, pos) - if char == ":" then - if val1 == nil then - return nil, pos, "cannot use nil as table index (at " .. loc (str, pos) .. ")" - end - pos = scanwhite (str, pos + 1) - if not pos then return unterminated (str, what, startpos) end - local val2 - val2, pos, err = scanvalue (str, pos, nullval, objectmeta, arraymeta) - if err then return nil, pos, err end - tbl[val1] = val2 - pos = scanwhite (str, pos) - if not pos then return unterminated (str, what, startpos) end - char = strsub (str, pos, pos) - else - n = n + 1 - tbl[n] = val1 - end - if char == "," then - pos = pos + 1 - end - end -end - -scanvalue = function (str, pos, nullval, objectmeta, arraymeta) - pos = pos or 1 - pos = scanwhite (str, pos) - if not pos then - return nil, strlen (str) + 1, "no valid JSON value (reached the end)" - end - local char = strsub (str, pos, pos) - if char == "{" then - return scantable ('object', "}", str, pos, nullval, objectmeta, arraymeta) - elseif char == "[" then - return scantable ('array', "]", str, pos, nullval, objectmeta, arraymeta) - elseif char == "\"" then - return scanstring (str, pos) - else - local pstart, pend = strfind (str, "^%-?[%d%.]+[eE]?[%+%-]?%d*", pos) - if pstart then - local number = str2num (strsub (str, pstart, pend)) - if number then - return number, pend + 1 - end - end - pstart, pend = strfind (str, "^%a%w*", pos) - if pstart then - local name = strsub (str, pstart, pend) - if name == "true" then - return true, pend + 1 - elseif name == "false" then - return false, pend + 1 - elseif name == "null" then - return nullval, pend + 1 - end - end - return nil, pos, "no valid JSON value at " .. loc (str, pos) - end -end - -local function optionalmetatables(...) - if select("#", ...) > 0 then - return ... - else - return {__jsontype = 'object'}, {__jsontype = 'array'} - end -end - -function json.decode (str, pos, nullval, ...) - local objectmeta, arraymeta = optionalmetatables(...) - return scanvalue (str, pos, nullval, objectmeta, arraymeta) -end - -function json.use_lpeg () - local g = require ("lpeg") - - if g.version() == "0.11" then - error "due to a bug in LPeg 0.11, it cannot be used for JSON matching" - end - - local pegmatch = g.match - local P, S, R = g.P, g.S, g.R - - local function ErrorCall (str, pos, msg, state) - if not state.msg then - state.msg = msg .. " at " .. loc (str, pos) - state.pos = pos - end - return false - end - - local function Err (msg) - return g.Cmt (g.Cc (msg) * g.Carg (2), ErrorCall) - end - - local function ErrorUnterminatedCall (str, pos, what, state) - return ErrorCall (str, pos - 1, "unterminated " .. what, state) - end - - local SingleLineComment = P"//" * (1 - S"\n\r")^0 - local MultiLineComment = P"/*" * (1 - P"*/")^0 * P"*/" - local Space = (S" \n\r\t" + P"\239\187\191" + SingleLineComment + MultiLineComment)^0 - - local function ErrUnterminated (what) - return g.Cmt (g.Cc (what) * g.Carg (2), ErrorUnterminatedCall) - end - - local PlainChar = 1 - S"\"\\\n\r" - local EscapeSequence = (P"\\" * g.C (S"\"\\/bfnrt" + Err "unsupported escape sequence")) / escapechars - local HexDigit = R("09", "af", "AF") - local function UTF16Surrogate (match, pos, high, low) - high, low = tonumber (high, 16), tonumber (low, 16) - if 0xD800 <= high and high <= 0xDBff and 0xDC00 <= low and low <= 0xDFFF then - return true, unichar ((high - 0xD800) * 0x400 + (low - 0xDC00) + 0x10000) - else - return false - end - end - local function UTF16BMP (hex) - return unichar (tonumber (hex, 16)) - end - local U16Sequence = (P"\\u" * g.C (HexDigit * HexDigit * HexDigit * HexDigit)) - local UnicodeEscape = g.Cmt (U16Sequence * U16Sequence, UTF16Surrogate) + U16Sequence/UTF16BMP - local Char = UnicodeEscape + EscapeSequence + PlainChar - local String = P"\"" * (g.Cs (Char ^ 0) * P"\"" + ErrUnterminated "string") - local Integer = P"-"^(-1) * (P"0" + (R"19" * R"09"^0)) - local Fractal = P"." * R"09"^0 - local Exponent = (S"eE") * (S"+-")^(-1) * R"09"^1 - local Number = (Integer * Fractal^(-1) * Exponent^(-1))/str2num - local Constant = P"true" * g.Cc (true) + P"false" * g.Cc (false) + P"null" * g.Carg (1) - local SimpleValue = Number + String + Constant - local ArrayContent, ObjectContent - - -- The functions parsearray and parseobject parse only a single value/pair - -- at a time and store them directly to avoid hitting the LPeg limits. - local function parsearray (str, pos, nullval, state) - local obj, cont - local start = pos - local npos - local t, nt = {}, 0 - repeat - obj, cont, npos = pegmatch (ArrayContent, str, pos, nullval, state) - if cont == 'end' then - return ErrorUnterminatedCall (str, start, "array", state) - end - pos = npos - if cont == 'cont' or cont == 'last' then - nt = nt + 1 - t[nt] = obj - end - until cont ~= 'cont' - return pos, setmetatable (t, state.arraymeta) - end - - local function parseobject (str, pos, nullval, state) - local obj, key, cont - local start = pos - local npos - local t = {} - repeat - key, obj, cont, npos = pegmatch (ObjectContent, str, pos, nullval, state) - if cont == 'end' then - return ErrorUnterminatedCall (str, start, "object", state) - end - pos = npos - if cont == 'cont' or cont == 'last' then - t[key] = obj - end - until cont ~= 'cont' - return pos, setmetatable (t, state.objectmeta) - end - - local Array = P"[" * g.Cmt (g.Carg(1) * g.Carg(2), parsearray) - local Object = P"{" * g.Cmt (g.Carg(1) * g.Carg(2), parseobject) - local Value = Space * (Array + Object + SimpleValue) - local ExpectedValue = Value + Space * Err "value expected" - local ExpectedKey = String + Err "key expected" - local End = P(-1) * g.Cc'end' - local ErrInvalid = Err "invalid JSON" - ArrayContent = (Value * Space * (P"," * g.Cc'cont' + P"]" * g.Cc'last'+ End + ErrInvalid) + g.Cc(nil) * (P"]" * g.Cc'empty' + End + ErrInvalid)) * g.Cp() - local Pair = g.Cg (Space * ExpectedKey * Space * (P":" + Err "colon expected") * ExpectedValue) - ObjectContent = (g.Cc(nil) * g.Cc(nil) * P"}" * g.Cc'empty' + End + (Pair * Space * (P"," * g.Cc'cont' + P"}" * g.Cc'last' + End + ErrInvalid) + ErrInvalid)) * g.Cp() - local DecodeValue = ExpectedValue * g.Cp () - - jsonlpeg.version = json.version - jsonlpeg.encode = json.encode - jsonlpeg.null = json.null - jsonlpeg.quotestring = json.quotestring - jsonlpeg.addnewline = json.addnewline - jsonlpeg.encodeexception = json.encodeexception - jsonlpeg.using_lpeg = true - - function jsonlpeg.decode (str, pos, nullval, ...) - local state = {} - state.objectmeta, state.arraymeta = optionalmetatables(...) - local obj, retpos = pegmatch (DecodeValue, str, pos, nullval, state) - if state.msg then - return nil, state.pos, state.msg - else - return obj, retpos - end - end - - -- cache result of this function: - json.use_lpeg = function () return jsonlpeg end - jsonlpeg.use_lpeg = json.use_lpeg - - return jsonlpeg -end - -if always_use_lpeg then - return json.use_lpeg() -end - -return json - From 93e037265512a93b32003228646c1bcce600b8a1 Mon Sep 17 00:00:00 2001 From: mjkzy Date: Sun, 3 Jul 2022 11:43:10 -0500 Subject: [PATCH 6/9] frontend checks --- data/ui_scripts/custom_depot/__init__.lua | 24 +++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/data/ui_scripts/custom_depot/__init__.lua b/data/ui_scripts/custom_depot/__init__.lua index a0d4b9fa..763127a8 100644 --- a/data/ui_scripts/custom_depot/__init__.lua +++ b/data/ui_scripts/custom_depot/__init__.lua @@ -1,3 +1,7 @@ +if (game:issingleplayer() or not Engine.InFrontend()) then + return +end + custom_depot = { collection_details_menu = nil, data = { @@ -11,7 +15,7 @@ custom_depot = { items = {}, reward_splashes = {}, has_accepted_mod_eula = false, - has_seen_mod_eula = false, + has_seen_mod_eula = false }, directory_path = "h1-mod", file_name = "depot_save.json", @@ -48,11 +52,13 @@ custom_depot.functions["load_depot_data"] = function() end custom_depot.functions["add_currency"] = function(currency_type, amount) - custom_depot.data.currencies[tostring(currency_type)] = custom_depot.data.currencies[tostring(currency_type)] + amount + custom_depot.data.currencies[tostring(currency_type)] = custom_depot.data.currencies[tostring(currency_type)] + + amount end custom_depot.functions["remove_currency"] = function(currency_type, amount) - custom_depot.data.currencies[tostring(currency_type)] = custom_depot.data.currencies[tostring(currency_type)] - amount + custom_depot.data.currencies[tostring(currency_type)] = custom_depot.data.currencies[tostring(currency_type)] - + amount end custom_depot.functions["get_currency"] = function(currency_type) @@ -98,6 +104,12 @@ custom_depot.functions["set_has_seen_mod_eula"] = function(value) end custom_depot.get_function("load_depot_data")() -require("mod_eula") -require("depot_override") -require("scoreboard_override") + +if (Engine.InFrontend()) then + require("mod_eula") + require("depot_override") +end + +if (Engine.InFrontend() == false) then + require("scoreboard_override") +end From e9644ea22061dbaf2487362f1d01497e8bf3f135 Mon Sep 17 00:00:00 2001 From: mjkzy Date: Sun, 3 Jul 2022 14:52:47 -0500 Subject: [PATCH 7/9] better concept, but its not working --- data/ui_scripts/custom_depot/__init__.lua | 40 +++++++++++++++-------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/data/ui_scripts/custom_depot/__init__.lua b/data/ui_scripts/custom_depot/__init__.lua index 763127a8..f36d5b3f 100644 --- a/data/ui_scripts/custom_depot/__init__.lua +++ b/data/ui_scripts/custom_depot/__init__.lua @@ -1,4 +1,4 @@ -if (game:issingleplayer() or not Engine.InFrontend()) then +if (game:issingleplayer()) then return end @@ -6,11 +6,11 @@ custom_depot = { collection_details_menu = nil, data = { currencies = { - ["1"] = 0, -- LaunchCredits - ["2"] = 0, -- Credits - ["3"] = 0, -- Parts - ["4"] = 0, -- CoDPoints - ["5"] = 0 -- Bonus + launchCredits = 0, -- LaunchCredits + credits = 0, -- Credits + parts = 0, -- Parts + codPoints = 0, -- CoDPoints + bonus = 0 -- Bonus }, items = {}, reward_splashes = {}, @@ -34,9 +34,7 @@ custom_depot.get_function = function(function_name) end custom_depot.functions["save_depot_data"] = function() - io.writefile(custom_depot.file_path, json.encode(custom_depot.data, { - indent = true - }), false) + io.writefile(custom_depot.file_path, json.encode(custom_depot.data), false) end custom_depot.functions["load_depot_data"] = function() @@ -51,14 +49,28 @@ custom_depot.functions["load_depot_data"] = function() custom_depot.data = json.decode(io.readfile(custom_depot.file_path)) end +local function convert_currency_to_string(type) + if type == InventoryCurrencyType.LaunchCredits then + return "launchCredits" + elseif type == InventoryCurrencyType.Credits then + return "credits" + elseif type == InventoryCurrencyType.Parts then + return "parts" + elseif type == InventoryCurrencyType.CoDPoints then + return "codPoints" + elseif type == InventoryCurrencyType.Bonus then + return "bonus" + end +end + custom_depot.functions["add_currency"] = function(currency_type, amount) - custom_depot.data.currencies[tostring(currency_type)] = custom_depot.data.currencies[tostring(currency_type)] + - amount + local type = convert_currency_to_string(currency_type) + custom_depot.data.currencies[type] = custom_depot.data.currencies[type] + amount end custom_depot.functions["remove_currency"] = function(currency_type, amount) - custom_depot.data.currencies[tostring(currency_type)] = custom_depot.data.currencies[tostring(currency_type)] - - amount + local type = convert_currency_to_string(currency_type) + custom_depot.data.currencies[type] = custom_depot.data.currencies[type] - amount end custom_depot.functions["get_currency"] = function(currency_type) @@ -110,6 +122,6 @@ if (Engine.InFrontend()) then require("depot_override") end -if (Engine.InFrontend() == false) then +if (not Engine.InFrontend()) then require("scoreboard_override") end From 47c09a5fa7389273182e68f848973d4cf8d8bffa Mon Sep 17 00:00:00 2001 From: Arwent Date: Sun, 3 Jul 2022 22:04:25 +0200 Subject: [PATCH 8/9] fixing concept and removing useless variable and parantheses --- data/ui_scripts/custom_depot/__init__.lua | 12 +++++++----- data/ui_scripts/custom_depot/depot_override.lua | 9 --------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/data/ui_scripts/custom_depot/__init__.lua b/data/ui_scripts/custom_depot/__init__.lua index f36d5b3f..598fc560 100644 --- a/data/ui_scripts/custom_depot/__init__.lua +++ b/data/ui_scripts/custom_depot/__init__.lua @@ -1,4 +1,4 @@ -if (game:issingleplayer()) then +if game:issingleplayer() then return end @@ -74,11 +74,13 @@ custom_depot.functions["remove_currency"] = function(currency_type, amount) end custom_depot.functions["get_currency"] = function(currency_type) - if not currency_type or not custom_depot.data.currencies[tostring(currency_type)] then + local type = convert_currency_to_string(currency_type) + + if not currency_type or not custom_depot.data.currencies[type] then return nil end - return custom_depot.data.currencies[tostring(currency_type)] + return custom_depot.data.currencies[type] end custom_depot.functions["add_item"] = function(item, value) @@ -117,11 +119,11 @@ end custom_depot.get_function("load_depot_data")() -if (Engine.InFrontend()) then +if Engine.InFrontend() then require("mod_eula") require("depot_override") end -if (not Engine.InFrontend()) then +if not Engine.InFrontend() then require("scoreboard_override") end diff --git a/data/ui_scripts/custom_depot/depot_override.lua b/data/ui_scripts/custom_depot/depot_override.lua index 88073ff3..51d223dd 100644 --- a/data/ui_scripts/custom_depot/depot_override.lua +++ b/data/ui_scripts/custom_depot/depot_override.lua @@ -1,12 +1,3 @@ -InventoryCurrencyType = { - LaunchCredits = 1, - Credits = 2, - Parts = 3, - CoDPoints = 4, - Bonus = 5, - Max = 6 -} - GetCurrencyBalance = function(currency_type) return custom_depot.get_function("get_currency")(currency_type) end From fb8614799059c203377a24e8eec1f2f805b981d7 Mon Sep 17 00:00:00 2001 From: mjkzy Date: Mon, 4 Jul 2022 18:47:08 -0500 Subject: [PATCH 9/9] better check for round based + fix nil values --- data/ui_scripts/custom_depot/__init__.lua | 10 ++++ .../custom_depot/scoreboard_override.lua | 47 +++++++++++++++---- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/data/ui_scripts/custom_depot/__init__.lua b/data/ui_scripts/custom_depot/__init__.lua index 598fc560..5548e971 100644 --- a/data/ui_scripts/custom_depot/__init__.lua +++ b/data/ui_scripts/custom_depot/__init__.lua @@ -2,6 +2,16 @@ if game:issingleplayer() then return end +-- from mpdepotbase.lua, global definition isn't working +InventoryCurrencyType = { + LaunchCredits = 1, + Credits = 2, + Parts = 3, + CoDPoints = 4, + Bonus = 5, + Max = 6 +} + custom_depot = { collection_details_menu = nil, data = { diff --git a/data/ui_scripts/custom_depot/scoreboard_override.lua b/data/ui_scripts/custom_depot/scoreboard_override.lua index 6f52b62e..bc7edbc5 100644 --- a/data/ui_scripts/custom_depot/scoreboard_override.lua +++ b/data/ui_scripts/custom_depot/scoreboard_override.lua @@ -1,17 +1,48 @@ -local player_score = 0 +-- from roundend.lua, dev comments says that the game["round_end"] array contains indexes for this table +local ending_reasons = { + "MP_DRAW", + "LUA_MENU_REPORT_DRAW", + "MP_ROUND_WIN", + "MP_ROUND_LOSS", + "LUA_MENU_REPORT_VICTORY", + "LUA_MENU_REPORT_DEFEAT", + "MP_HALFTIME", + "MP_OVERTIME", + "MP_ROUNDEND", + "MP_INTERMISSION", + "MP_SWITCHING_SIDES", + "MP_MATCH_BONUS_IS", + "MP_MATCH_TIE", + "MP_GAME_END", + "SPLASHES_BLANK" +} + +local function starts_with(str, start) + return str:sub(1, #start) == start +end + local player_old_score = 0 -Scoreboard_orig = LUI.MenuBuilder.m_types_build["scoreboard"] -Scoreboard = function(unk1, unk2) - local scoreboard = Scoreboard_orig(unk1, unk2) +local scoreboard_orig = LUI.MenuBuilder.m_types_build["scoreboard"] +local scoreboard = function(unk1, unk2) + local scoreboard = scoreboard_orig(unk1, unk2) scoreboard:registerOmnvarHandler("ui_round_end", function(f22_arg0, f22_arg1) if GameX.IsRankedMatch() then + local player_score = 0 + local gamemode = GameX.GetGameMode() local player_stats = Game.GetPlayerScoreInfoAtRank(Game.GetPlayerTeam(), Game.GetPlayerScoreRanking()) - if Engine.GetDvarInt(string.format("scr_%s_halftime", gamemode)) == 1 or IsGameTypeRoundBased(gamemode) or - gamemode == "conf" or gamemode == "war" then + --[[ + this will do the job for when its needed, aka when round loss/win occurs + this check may be true more than once cuz this callback happens 3 times, + but the player_old_score variable will stop us from adding more currency + ]] -- + local unlocalized_string = ending_reasons[Game.GetOmnvar("ui_round_end_title")] + local is_round_based = starts_with(unlocalized_string, "MP_ROUND") or IsGameTypeRoundBased(gamemode) + + if is_round_based or gamemode == "conf" or gamemode == "war" then player_score = player_stats.score else player_score = player_stats.extrascore0 @@ -19,7 +50,7 @@ Scoreboard = function(unk1, unk2) local currency_gain = math.floor((player_score - player_old_score) * 10 / 100) - if currency_gain == 0 then + if currency_gain <= 0 then return end @@ -32,4 +63,4 @@ Scoreboard = function(unk1, unk2) return scoreboard end -LUI.MenuBuilder.m_types_build["scoreboard"] = Scoreboard +LUI.MenuBuilder.m_types_build["scoreboard"] = scoreboard