Skip to content

Commit d2ed2dc

Browse files
committed
hotfix (quick actions - event reorganization)
actually I want this at the end so that events quick access actions (triggers) are the priority also don't add the options if there's nothing in bulk select
1 parent b2211e5 commit d2ed2dc

File tree

1 file changed

+41
-41
lines changed

1 file changed

+41
-41
lines changed

lua/pac3/editor/client/parts.lua

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -3841,47 +3841,6 @@ end
38413841
function pace.AddClassSpecificPartMenuComponents(menu, obj)
38423842
if obj.Notes == "showhidetest" then menu:AddOption("(hide/show test) reset", function() obj:CallRecursive("OnShow") end):SetIcon("icon16/star.png") end
38433843

3844-
do --event reorganization
3845-
local full_events = true
3846-
for i,v in ipairs(pace.BulkSelectList) do
3847-
if v.ClassName ~= "event" then full_events = false end
3848-
end
3849-
if full_events then
3850-
menu:AddOption("reorganize into a non-ACO pocket", function()
3851-
for i,part in ipairs(pace.BulkSelectList) do
3852-
part:SetParent(part:GetRootPart())
3853-
end
3854-
local prime_parent = obj:GetParent()
3855-
if prime_parent.ClassName == "event" or pace.BulkSelectList[1] == prime_parent then
3856-
prime_parent = obj:GetRootPart()
3857-
end
3858-
for i,part in ipairs(pace.BulkSelectList) do
3859-
part:SetParent()
3860-
part:SetAffectChildrenOnly(false)
3861-
part:SetDestinationPart()
3862-
end
3863-
obj:SetParent(prime_parent)
3864-
for i,part in ipairs(pace.BulkSelectList) do
3865-
part:SetParent(obj)
3866-
end
3867-
end):SetIcon("icon16/clock_link.png")
3868-
menu:AddOption("reorganize into an ACO downward tower", function()
3869-
local parent = obj:GetParent()
3870-
local grandparent = obj:GetParent()
3871-
if parent.Parent then grandparent = parent:GetParent() end
3872-
3873-
for i,part in ipairs(pace.BulkSelectList) do
3874-
part:SetAffectChildrenOnly(true)
3875-
part:SetDestinationPart()
3876-
part:SetParent(parent)
3877-
parent = part
3878-
end
3879-
pace.BulkSelectList[1]:SetParent(obj:GetParent())
3880-
obj:SetParent(parent)
3881-
end):SetIcon("icon16/clock_link.png")
3882-
end
3883-
end
3884-
38853844
if obj.ClassName == "camera" then
38863845
if not obj:IsHidden() then
38873846
local remembered_view = {pace.ViewPos, pace.ViewAngles}
@@ -4059,6 +4018,47 @@ function pace.AddClassSpecificPartMenuComponents(menu, obj)
40594018
end
40604019
end
40614020

4021+
do --event reorganization
4022+
local full_events = true
4023+
for i,v in ipairs(pace.BulkSelectList) do
4024+
if v.ClassName ~= "event" then full_events = false end
4025+
end
4026+
if #pace.BulkSelectList > 0 and full_events then
4027+
menu:AddOption("reorganize into a non-ACO pocket", function()
4028+
for i,part in ipairs(pace.BulkSelectList) do
4029+
part:SetParent(part:GetRootPart())
4030+
end
4031+
local prime_parent = obj:GetParent()
4032+
if prime_parent.ClassName == "event" or pace.BulkSelectList[1] == prime_parent then
4033+
prime_parent = obj:GetRootPart()
4034+
end
4035+
for i,part in ipairs(pace.BulkSelectList) do
4036+
part:SetParent()
4037+
part:SetAffectChildrenOnly(false)
4038+
part:SetDestinationPart()
4039+
end
4040+
obj:SetParent(prime_parent)
4041+
for i,part in ipairs(pace.BulkSelectList) do
4042+
part:SetParent(obj)
4043+
end
4044+
end):SetIcon("icon16/clock_link.png")
4045+
menu:AddOption("reorganize into an ACO downward tower", function()
4046+
local parent = obj:GetParent()
4047+
local grandparent = obj:GetParent()
4048+
if parent.Parent then grandparent = parent:GetParent() end
4049+
4050+
for i,part in ipairs(pace.BulkSelectList) do
4051+
part:SetAffectChildrenOnly(true)
4052+
part:SetDestinationPart()
4053+
part:SetParent(parent)
4054+
parent = part
4055+
end
4056+
pace.BulkSelectList[1]:SetParent(obj:GetParent())
4057+
obj:SetParent(parent)
4058+
end):SetIcon("icon16/clock_link.png")
4059+
end
4060+
end
4061+
40624062
pace.AddQuickSetupsToPartMenu(menu, obj)
40634063
end
40644064

0 commit comments

Comments
 (0)