Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/run-luau-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ jobs:
build:
if: ${{ !github.event.pull_request.draft }}
name: Build testing place
runs-on: ubuntu-24.04
timeout-minutes: 1
runs-on: windows-latest
timeout-minutes: 2
steps:
- name: Checkout repository
uses: actions/[email protected]
Expand Down
24 changes: 13 additions & 11 deletions src/DialogueEditor/components/Toolbar/init.luau
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,21 @@ local function Toolbar(props: ToolbarProps)

historyIdentifier = beginHistoryRecording(`Add {type:lower()} to NPC`);

local targetFolder = selectedScript:FindFirstChild(`{type}s`);
if not targetFolder then

local newTargetFolder = Instance.new("Folder");
newTargetFolder.Name = `{type}s`;
newTargetFolder.Parent = selectedScript;
targetFolder = newTargetFolder;

end;

assert(targetFolder); -- To silence the type checker.

-- Find a name for the content script.
local targetPriority = 1;
for _, instance in selectedScript:GetChildren() do
for _, instance in targetFolder:GetChildren() do

local comparedName = tonumber(instance.Name);
if comparedName and comparedName >= targetPriority then
Expand All @@ -93,16 +105,6 @@ local function Toolbar(props: ToolbarProps)

end;

local targetFolder = selectedScript:FindFirstChild(`{type}s`);
if not targetFolder then

local newTargetFolder = Instance.new("Folder");
newTargetFolder.Name = `{type}s`;
newTargetFolder.Parent = selectedScript;
targetFolder = newTargetFolder;

end;

newContentScript.Parent = targetFolder;

end;
Expand Down