From 4ac4e4a0ce367f99ddf8af80f7fcd2d5f298126b Mon Sep 17 00:00:00 2001 From: ellomenop Date: Thu, 23 May 2024 14:14:13 -0400 Subject: [PATCH 1/3] Fix for modifying objects via browser --- src/browser.lua | 2 +- src/main.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/browser.lua b/src/browser.lua index 3e36672..ceed95c 100644 --- a/src/browser.lua +++ b/src/browser.lua @@ -432,7 +432,7 @@ do local function peval(text) local func = load("return " .. text) if not func then return nil end - setfenv(func,_G) + envy.setfenv(func,_G) local ret = table.pack(pcall(func)) if ret.n <= 1 then return end if not ret[1] then return end diff --git a/src/main.lua b/src/main.lua index e179ad1..9ac7cfb 100644 --- a/src/main.lua +++ b/src/main.lua @@ -5,6 +5,7 @@ local envy = rom.mods["SGG_Modding-ENVY"] ---@module 'SGG_Modding-ENVY-auto' envy.auto() +private.envy = envy import('core.lua') import('browser.lua',nil,envy.globals) From 3efd878d9761b1b450010736664e8a9bda959f96 Mon Sep 17 00:00:00 2001 From: ellomenop Date: Thu, 23 May 2024 15:58:16 -0400 Subject: [PATCH 2/3] Fix for sorting mixed content tables in Object Browser Updated changelog and version to 1.0.3 --- CHANGELOG.md | 7 +++++++ src/browser.lua | 2 +- thunderstore.toml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 765f311..765e1db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.3] - 2024-05-23 + +### Changed + +- Fixed typo that prevented modifying objects via the Object Browser +- Fixed crash while sorting mixed content tables in Object Browser + ## [1.0.2] - 2024-05-23 ### Changed diff --git a/src/browser.lua b/src/browser.lua index ceed95c..8606ab1 100644 --- a/src/browser.lua +++ b/src/browser.lua @@ -314,7 +314,7 @@ do for k in iter(data) do table.insert(order,k) end - table.sort(order) + table.sort(order, function(a,b) return tostring(a) < tostring(b) end) for _,k in ipairs(order) do local v = data[k] for _,sd in public.vararg(entrify(k,v,ed)) do diff --git a/thunderstore.toml b/thunderstore.toml index 365988e..8b3f7ff 100644 --- a/thunderstore.toml +++ b/thunderstore.toml @@ -4,7 +4,7 @@ schemaVersion = "0.0.1" [package] namespace = "SGG_Modding" name = "SeerSuite" -versionNumber = "1.0.2" +versionNumber = "1.0.3" description = "Defines debug tools such as an Object Browser and Script Console." websiteUrl = "https://github.com/SGG-Modding/SeerSuite" containsNsfwContent = false From 684c6579c65d287277ea6ab1984a672b601d50b1 Mon Sep 17 00:00:00 2001 From: Andre Louis Issa Date: Fri, 24 May 2024 07:53:03 +1000 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 765e1db..441c450 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [1.0.3] - 2024-05-23 - ### Changed -- Fixed typo that prevented modifying objects via the Object Browser -- Fixed crash while sorting mixed content tables in Object Browser +- Fixed issue that prevented modifying values within the Object Browser +- Fixed error while sorting mixed-type keys in the Object Browser ## [1.0.2] - 2024-05-23