Skip to content

Commit

Permalink
v229
Browse files Browse the repository at this point in the history
  • Loading branch information
@Sceleratis
Sceleratis committed Oct 8, 2021
1 parent b78602b commit 225e102
Show file tree
Hide file tree
Showing 12 changed files with 637 additions and 234 deletions.
11 changes: 10 additions & 1 deletion Loader/Config/Settings.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ local descs = {}; --// Contains settings descriptions

--------------
-- SETTINGS --
--------------
--------------
--[[
--// Basic Lua Info
Expand Down Expand Up @@ -206,6 +206,12 @@ local descs = {}; --// Contains settings descriptions
-- "ban:200,300" --// Makes it so :ban is only usable by levels 200 and 300 specifically (nothing higher or lower or in between)
}; -- Format: {"Command:NewLevel"; "Command:Customrank1,Customrank2,Customrank3";}

--// Use the below table to define "pre-set" command aliases
--// Command aliases; Format: {[":alias <arg1> <arg2> ..."] = ":command <arg1> <arg2> ..."}
settings.Aliases = {
[":examplealias <player> <fireColor>"] = ":ff <player> | :fling <player> | :fire <player> <fireColor>" --// Order arguments appear in alias string determines their required order in the command message when ran later
};

settings.Banned = {}; -- List of people banned from the game Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
settings.Muted = {}; -- List of people muted Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
settings.Blacklist = {}; -- List of people banned from using admin Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID"; "GamePass:GamePassID";}
Expand Down Expand Up @@ -348,6 +354,8 @@ local descs = {}; --// Contains settings descriptions
descs.Creators = [[ Anyone to be identified as a place owner; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID";} ]]

descs.Permissions = [[ Command permissions; Format: {"Command:NewLevel";} ]]
descs.Aliases = [[ Command aliases; Format: {[":alias <arg1> <arg2> ..."] = ":command <arg1> <arg2> ..."} ]]

descs.Commands = [[ Custom commands ]]
descs.Banned = [[ List of people banned from the game; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID";} ]]
descs.Muted = [[ List of people muted; Format: {"Username"; "Username:UserId"; UserId; "Group:GroupId:GroupRank"; "Group:GroupId"; "Item:ItemID";} ]]
Expand Down Expand Up @@ -445,6 +453,7 @@ local descs = {}; --// Contains settings descriptions
--"Creators";
" ";
"Permissions";
--"Aliases";
--"Commands";
" ";
"Banned";
Expand Down
41 changes: 21 additions & 20 deletions MainModule/Client/UI/Default/Notification.rbxmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Meta name="ExplicitAutoJoints">true</Meta>
<External>null</External>
<External>nil</External>
<Item class="Frame" referent="RBX79D1844984C94B6A935F7BF5B265F23A">
<Item class="Frame" referent="RBX05F40956C3C24ADFAF4B4E1E42022B94">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -56,19 +56,19 @@
<bool name="Visible">true</bool>
<int name="ZIndex">9</int>
</Properties>
<Item class="Folder" referent="RBX0D988A7E1AA04CDA95BA968CD690AC69">
<Item class="Folder" referent="RBX4147886409804859863596D8A30737F5">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<string name="Name">Config</string>
<int64 name="SourceAssetId">-1</int64>
<BinaryString name="Tags"></BinaryString>
</Properties>
<Item class="ModuleScript" referent="RBXE61B5FCE2F664C26A2B950CFEFE9AD81">
<Item class="ModuleScript" referent="RBX2F199C95244741DDAFBC32F859C96CF3">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<Content name="LinkedSource"><null></null></Content>
<string name="Name">Code</string>
<string name="ScriptGuid">{9DD68714-7FBF-4E41-B6CE-BCB169D849C8}</string>
<string name="ScriptGuid">{E696A2BA-1BCA-4FEE-8F31-220766604DE3}</string>
<ProtectedString name="Source"><![CDATA[client = nil
cPcall = nil
Pcall = nil
Expand All @@ -84,10 +84,12 @@ return function(data)
local localplayer = service.Players.LocalPlayer

local frame = script.Parent.Parent
local close = frame.Frame.Close
local main = frame.Frame.Main
local title = frame.Frame.Title
local timer = frame.Frame.Timer
local nFrame = frame:WaitForChild("Frame");
local iconF = nFrame:WaitForChild("Icon");
local main = nFrame:WaitForChild("Main");
local close = nFrame:WaitForChild("Close");
local title = nFrame:WaitForChild("Title");
local timer = nFrame:WaitForChild("Timer");

local gTable = data.gTable
local clickfunc = data.OnClick
Expand Down Expand Up @@ -160,9 +162,8 @@ return function(data)

holder = holder.Object.Frame
title.Text = name
frame.Name = name
main.Text = text
frame.Frame.Icon.Image = icon
iconF.Image = icon

main.MouseButton1Click:Connect(function()
if frame and frame.Parent then
Expand Down Expand Up @@ -226,7 +227,7 @@ end]]></ProtectedString>
<BinaryString name="Tags"></BinaryString>
</Properties>
</Item>
<Item class="BoolValue" referent="RBX843ABEEE5FE147E69B3768BE27C38ACA">
<Item class="BoolValue" referent="RBX6CF4075FD8894C7DA8ECED25EE95B175">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<string name="Name">AllowMultiple</string>
Expand All @@ -235,7 +236,7 @@ end]]></ProtectedString>
<bool name="Value">true</bool>
</Properties>
</Item>
<Item class="BoolValue" referent="RBX5A9F1E371B0442EBB07F13F095C5495F">
<Item class="BoolValue" referent="RBX7534694CA085492E8D203EDE1193B71B">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<string name="Name">CanKeepAlive</string>
Expand All @@ -245,7 +246,7 @@ end]]></ProtectedString>
</Properties>
</Item>
</Item>
<Item class="Frame" referent="RBX20703EA5E2484CAA96499514F0435FDD">
<Item class="Frame" referent="RBX15773B381EFE424E860113D1331910DE">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -299,7 +300,7 @@ end]]></ProtectedString>
<bool name="Visible">true</bool>
<int name="ZIndex">1</int>
</Properties>
<Item class="TextButton" referent="RBX6B59B2B19BE3406EA4DE22F48BE06E4F">
<Item class="TextButton" referent="RBX066597CDEF6246ED9C2CD216BE86F668">
<Properties>
<bool name="Active">true</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -380,7 +381,7 @@ end]]></ProtectedString>
<int name="ZIndex">10</int>
</Properties>
</Item>
<Item class="TextButton" referent="RBXA9C2E22169534F0F929F4D8E2F340369">
<Item class="TextButton" referent="RBXE606EB0CD86F4003920B3C2B4A6C4386">
<Properties>
<bool name="Active">true</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -460,7 +461,7 @@ end]]></ProtectedString>
<bool name="Visible">true</bool>
<int name="ZIndex">10</int>
</Properties>
<Item class="UITextSizeConstraint" referent="RBXB873304654054BB4BDC5D3E0FEC6657A">
<Item class="UITextSizeConstraint" referent="RBXD5AFEDF71AA8475CA83AC9590B81C8DD">
<Properties>
<BinaryString name="AttributesSerialize"></BinaryString>
<int name="MaxTextSize">20</int>
Expand All @@ -471,7 +472,7 @@ end]]></ProtectedString>
</Properties>
</Item>
</Item>
<Item class="TextLabel" referent="RBXDC5A441C5AA2483596C4B16AC1FF02C6">
<Item class="TextLabel" referent="RBXAA1FDF3F217049FE8396A48606969DA7">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -548,7 +549,7 @@ end]]></ProtectedString>
<int name="ZIndex">10</int>
</Properties>
</Item>
<Item class="TextLabel" referent="RBXE82E0181BA9C4A55979D8A9D4B3A3DFF">
<Item class="TextLabel" referent="RBXAB48DF7D26B74DB7AD5017B6E77250F3">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -625,7 +626,7 @@ end]]></ProtectedString>
<int name="ZIndex">10</int>
</Properties>
</Item>
<Item class="ImageLabel" referent="RBX84BA297E39E24A888923DD428EA0B3D2">
<Item class="ImageLabel" referent="RBX3A4ABB5EF0DC4E84A4ACE1B92916B09D">
<Properties>
<bool name="Active">false</bool>
<Vector2 name="AnchorPoint">
Expand Down Expand Up @@ -715,4 +716,4 @@ end]]></ProtectedString>
</Item>
</Item>
</Item>
</roblox>
</roblox>
10 changes: 5 additions & 5 deletions MainModule/Client/UI/Default/UserPanel.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ return function(data)
local window = client.UI.Make("Window",{
Name = "UserPanel";
Title = "Adonis";
Icon = "rbxassetid://4335479121";
Icon = "rbxassetid://7681261289"; --"rbxassetid://7681088830"; --"rbxassetid://7681233602"; --"rbxassetid://7681048299";
Size = {465, 325};
AllowMultiple = false;
OnClose = function()
Expand Down Expand Up @@ -353,9 +353,9 @@ return function(data)
Size = UDim2.new(0, 18, 0, 18);
Position = UDim2.new(1, -22, 0, 4);
})

end


--// Donor Tab
do
Expand Down Expand Up @@ -1127,7 +1127,7 @@ return function(data)
end
end
})

orgTextTransparency = removeButton.TextTransparency
if removeButton.AutoButtonColor then -- considers certain themes with AutoButtonColor = false
autoButtonColor = true
Expand Down Expand Up @@ -1467,7 +1467,7 @@ return function(data)
})
end
end
elseif not canEditTables[setting] then
elseif not canEditTables[setting] then
gameTab:Add("TextLabel", {
Text = " "..setting..": ";
ToolTip = desc;
Expand Down
Loading

0 comments on commit 225e102

Please sign in to comment.