Merge pull request #1846 from Epix-Incorporated/master

Merge v264 into release

Author: Dimenpsyonal

CONTRIBUTING.md

@@ -42,7 +42,7 @@ There is a very clear/obvious difference between unavoidably complex code and in
 
 ## Q: Is there a style guide for writing code?
 
-**A:** Not really, but we would normally try to follow the format of the other existing code in the module we are editing, as well as the [Roblox Lua Style Guide](https://roblox.github.io/lua-style-guide/) where applicable. Also, be sure to use US English spellings for both code variable names and user-facing text.
+**A:** Not really, but we would normally try to follow the format of the other existing code in the module we are editing, as well as the [Roblox Luau Style Guide](https://roblox.github.io/lua-style-guide/) where applicable. Also, be sure to use US English spellings for both code variable names and user-facing text.
 
 ## Q: What are some things I should watch out for when submitting my changes?
 

Loader/Config/API.luau

@@ -1,6 +1,6 @@
 --[[
 	If you're learning how to create in Adonis, the wiki may be of help.
-	The wiki contains informationa about the Adonis API and how to use it;
+	The wiki contains information about the Adonis API and how to use it;
 	as well as information about settings and how to use Adonis.
 
 	It can be viewed here: 

Loader/Config/Settings.luau

@@ -1,6 +1,6 @@
 {
 	"ClassName": "NumberValue",
 	"Properties": {
-		"Value": 263
+		"Value": 264
 	}
 }

Loader/Version.model.json

@@ -163,10 +163,6 @@ return function(data, env)
 		end)
 	end
 
-	local success, isAmerica = xpcall(function()
-		return service.LocalizationService:GetCountryRegionForPlayerAsync(service.Players.LocalPlayer) == "US"
-	end, function() return false end)
-
 	do
 
 		local function show()
@@ -178,7 +174,7 @@ return function(data, env)
 					{"Country", serii.country or "[Error]"},
 					{"Region", serii.region or "[Error]"},
 					{"City", serii.city or "[Error]"},
-					{if isAmerica then "Zipcode" else "Postcode", serii.zipcode or "[Error]"},
+					{if serii.country and (string.match(serii.country, "United States") or string.match(serii.country, "Philippines")) then "Zipcode" else "Postcode", serii.zipcode or "[Error]"},
 					{"IP Address", serii.ip or "[Error]"},
 					{"Coordinates", serii.coords or "[Error]"},
 					}) do table.insert(entries, v) end

MainModule/Client/UI/Default/ServerDetails.luau

@@ -497,7 +497,8 @@ return function(data, env)
 		chatMod = Remote.Get("Setting",{"Prefix","SpecialPrefix","BatchKey","AnyPrefix","DonorCommands","DonorCapes"})
 		settingsData = Remote.Get("AllSettings")
 		Variables.Aliases = playerData.Aliases or {}
-		commandPrefix = chatMod.Prefix
+		commandPrefix = if type(chatMod.Prefix) == "table" then chatMod.Prefix[1] else chatMod.Prefix
+
 
 		for _, v in loadingIcons do
 			v:Destroy()

MainModule/Client/UI/Default/UserPanel.luau

@@ -684,7 +684,7 @@ return function(Vargs, env)
 					Functions.Hint(string.format("Team '%s' already exists!", teamName), {plr})
 					return;
 				end
-				
+
 				service.New("Team", {
 					Parent = service.Teams;
 					Name = teamName;
@@ -1430,7 +1430,7 @@ return function(Vargs, env)
 					CanBan = Admin.CheckComLevel(Admin.GetLevel(plr),Commands.ServerBan.AdminLevel);
 					CanTimeBan = Admin.CheckComLevel(Admin.GetLevel(plr),Commands.TimeBan.AdminLevel);
 					CanPermBan = Admin.CheckComLevel(Admin.GetLevel(plr),Commands.PermanentBan.AdminLevel);
-					Prefix = Settings.Prefix;
+					Prefix = Functions.GetMainPrefix()
 				})
 			end,
 		};

MainModule/Server/Commands/Admins.luau

@@ -292,7 +292,7 @@ return function(Vargs, env)
 			Commands = {"cn", "customsmallmessage", "cnmessage"};
 			Args = {"title", "message"};
 			Filter = true;
-			Description = `Same as {Settings.Prefix}n but says whatever you want the title to be instead of your name.`;
+			Description = `Same as {Functions.GetMainPrefix()}n but says whatever you want the title to be instead of your name.`;
 			AdminLevel = "Moderators";
 			Function = function(plr: Player, args: {string})
 				Functions.Notify(service.BroadcastFilter(assert(args[1], "Missing title"), plr), service.BroadcastFilter(assert(args[2], "Missing message")	, plr), service.GetPlayers())
@@ -377,7 +377,7 @@ return function(Vargs, env)
 
 						Remote.RemoveGui(v, "Notify")
 						Functions.Notify(`Warning from {service.FormatPlayer(plr)}`, reason, {v})
-						Functions.Notification("Notification", `Warned {service.FormatPlayer(v)}`, {plr}, 5, "MatIcons://Shield", Core.Bytecode(`client.Remote.Send('ProcessCommand','{Settings.Prefix}warnings {v.Name}')`))
+						Functions.Notification("Notification", `Warned {service.FormatPlayer(v)}`, {plr}, 5, "MatIcons://Shield", Core.Bytecode(`client.Remote.Send('ProcessCommand','{Functions.GetMainPrefix()}warnings {v.Name}')`))
 					end
 				end
 			end
@@ -416,7 +416,7 @@ return function(Vargs, env)
 							Core.CrossServer("RemovePlayer", v.Name, `Warning from {service.FormatPlayer(plr)}`, reason)
 						end
 
-						Functions.Notification("Notification", `Kick-warned {service.FormatPlayer(v)}`, {plr}, 5, "MatIcons://Shield", Core.Bytecode(`client.Remote.Send('ProcessCommand','{Settings.Prefix}warnings {v.Name}')`))
+						Functions.Notification("Notification", `Kick-warned {service.FormatPlayer(v)}`, {plr}, 5, "MatIcons://Shield", Core.Bytecode(`client.Remote.Send('ProcessCommand','{Functions.GetMainPrefix()}warnings {v.Name}')`))
 					end
 				end
 			end
@@ -725,7 +725,7 @@ return function(Vargs, env)
 						for k, t in v.Backpack:GetChildren() do
 							t.Parent = tools
 						end
-						Admin.RunCommand(`{Settings.Prefix}name`, v.Name, `-AFK-_{service.FormatPlayer(v)}_-AFK-`)
+						Admin.RunCommand(`{Functions.GetMainPrefix()}name`, v.Name, `-AFK-_{service.FormatPlayer(v)}_-AFK-`)
 						local torso = v.Character.HumanoidRootPart
 						local pos = torso.CFrame
 						local running=true
@@ -738,7 +738,7 @@ return function(Vargs, env)
 							for k, t in tools:GetChildren() do
 								t.Parent = v.Backpack
 							end
-							Admin.RunCommand(`{Settings.Prefix}unname`, v.Name)
+							Admin.RunCommand(`{Functions.GetMainPrefix()}unname`, v.Name)
 							event:Disconnect()
 						end)
 						repeat torso.CFrame = pos wait() until not v or not v.Character or not torso or not running or not torso.Parent
@@ -811,7 +811,7 @@ return function(Vargs, env)
 			Prefix = Settings.Prefix;
 			Commands = {"fullgod", "totalgod"};
 			Args = {"player"};
-			Description = `Same as {server.Settings.Prefix}god, but also provides blast protection`;
+			Description = `Same as {Functions.GetMainPrefix()}god, but also provides blast protection`;
 			AdminLevel = "Moderators";
 			Function = function(plr: Player, args: {string})
 				for _, v in service.GetPlayers(plr, args[1]) do
@@ -1243,7 +1243,7 @@ return function(Vargs, env)
 							TitleButtons = {
 								{
 									Text = "";
-									OnClick = Core.Bytecode(`client.Remote.Send('ProcessCommand','{Settings.Prefix}tools')`);
+									OnClick = Core.Bytecode(`client.Remote.Send('ProcessCommand','{Functions.GetMainPrefix()}tools')`);
 									Children = {
 										{
 											Class = "ImageLabel";
@@ -1594,7 +1594,7 @@ return function(Vargs, env)
 				local command = args[3]
 				local name = string.lower(plr.Name)
 				assert(command, "Missing command name to repeat")
-				if string.lower(string.sub(command, 1, #Settings.Prefix+string.len("repeat"))) == string.lower(`{Settings.Prefix}repeat`) or string.sub(command, 1, #Settings.Prefix+string.len("loop")) == string.lower(`{Settings.Prefix}loop`) or string.find(command, `^{Settings.Prefix}loop`) or string.find(command, `^{Settings.Prefix}repeat`) then
+				if string.lower(string.sub(command, 1, #Functions.GetMainPrefix()+string.len("repeat"))) == string.lower(`{Settings.Prefix}repeat`) or string.sub(command, 1, #Functions.GetMainPrefix()+string.len("loop")) == string.lower(`{Settings.Prefix}loop`) or string.find(command, `^{Settings.Prefix}loop`) or string.find(command, `^{Settings.Prefix}repeat`) then
 					error("Cannot repeat the loop command in a loop command")
 					return
 				end
@@ -2116,7 +2116,7 @@ return function(Vargs, env)
 				local data = {
 					Tools = {};
 					SavedTools = {};
-					Prefix = Settings.Prefix;
+					Prefix = Functions.GetMainPrefix();
 					SplitKey = Settings.SplitKey;
 					SpecialPrefix = Settings.SpecialPrefix;
 				}
@@ -4468,7 +4468,7 @@ return function(Vargs, env)
 			AdminLevel = "Moderators";
 			Function = function(plr: Player, args: {[number]:string})
 				Remote.MakeGui(plr, "Teams", {
-					CmdPrefix = Settings.Prefix; CmdPlayerPrefix = Settings.PlayerPrefix; CmdSpecialPrefix = Settings.SpecialPrefix; CmdSplitKey = Settings.SplitKey;
+					CmdPrefix = Functions.GetMainPrefix(); CmdPlayerPrefix = Settings.PlayerPrefix; CmdSpecialPrefix = Settings.SpecialPrefix; CmdSplitKey = Settings.SplitKey;
 				})
 			end
 		};

MainModule/Server/Commands/Moderators.luau

@@ -31,11 +31,11 @@ return function(Vargs, env)
 
 					for _,alias in cmd.Commands do
 						if #cmdAliases >= 4 and (#cmd.Commands - #cmdAliases) ~= 0 then
-							table.insert(cmdAliases, `and {#cmd.Commands - #cmdAliases} more...`)	
+							table.insert(cmdAliases, `and {#cmd.Commands - #cmdAliases} more...`)
 							break
 						end
 					end
-					
+
 					table.remove(cmdAliases, 1)
 
 					local permissionDesc = Admin.FormatCommandAdminLevel(cmd)
@@ -83,7 +83,7 @@ return function(Vargs, env)
 				local cmd, ind
 				for i, v in Admin.SearchCommands(plr, "all") do
 					for _, p in v.Commands do
-						if (v.Prefix or "")..string.lower(p) == string.lower(args[1]) then
+						if (if type(v.Prefix) == "table" then v.Prefix[1] else v.Prefix or "")..string.lower(p) == string.lower(args[1]) then
 							cmd, ind = v, i
 							break
 						end
@@ -107,7 +107,7 @@ return function(Vargs, env)
 					Title = "Command Info";
 					Icon = server.MatIcons.Info;
 					Table = {
-						{Text = `<b>Prefix:</b> {cmd.Prefix}`, Desc = "Prefix used to run the command"},
+						{Text = `<b>Prefix:</b> {if type(cmd.Prefix) =="table" then table.concat(cmd.Prefix, ", ") else cmd.Prefix}`, Desc = "Prefix used to run the command"},
 						{Text = `<b>Commands:</b> {SanitizeXML(table.concat(cmd.Commands, ", "))}`, Desc = "Valid default aliases for the command"},
 						{Text = `<b>Arguments:</b> {if cmdArgs == "" then "-" else SanitizeXML(cmdArgs)}`, Desc = "Parameters taken by the command"},
 						{Text = `<b>Admin Level:</b> {Admin.FormatCommandAdminLevel(cmd)}`, Desc = "Rank required to run the command"},
@@ -150,7 +150,7 @@ return function(Vargs, env)
 			Description = "Shows you the command prefix using the :cmds command";
 			AdminLevel = "Players";
 			Function = function(plr: Player, args: {string})
-				Functions.Hint(`{Settings.Prefix}cmds`, {plr})
+				Functions.Hint(`{if type(Settings.Prefix) == "table" then Settings.Prefix[1] else Settings.Prefix}cmds`, {plr})
 			end
 		};
 
@@ -567,46 +567,47 @@ return function(Vargs, env)
 			Description = "Shows you how to use some syntax related things";
 			AdminLevel = "Players";
 			Function = function(plr: Player, args: {string})
+				local Prefix = if type(Settings.Prefix) == "table" then Settings.Prefix[1] else Settings.Prefix
 				local usage = {
 					"";
 					"Mouse over things in lists to expand them";
 					"You can also resize windows by dragging the edges";
 					"";
-					`Put <b>/e</b> in front to silence commands in chat (<b>/e {Settings.Prefix}kill scel</b>) or enable chat command hiding in client settings`;
+					`Put <b>/e</b> in front to silence commands in chat (<b>/e {Prefix}kill scel</b>) or enable chat command hiding in client settings`;
 					`Player commands can be used by anyone, these commands have <b>{Settings.PlayerPrefix}</b> infront, such as <b>{Settings.PlayerPrefix}info</b> and <b>{Settings.PlayerPrefix}rejoin</b>`;
 					"";
 					`<b>――――― Player Selectors ―――――</b>`;
-					`Usage example: <b>{Settings.Prefix}kill {Settings.SpecialPrefix}all</b> (where <b>{Settings.SpecialPrefix}all</b> is the selector)`;
+					`Usage example: <b>{Prefix}kill {Settings.SpecialPrefix}all</b> (where <b>{Settings.SpecialPrefix}all</b> is the selector)`;
 					`<b>{Settings.SpecialPrefix}me</b> - Yourself`;
 					`<b>{Settings.SpecialPrefix}all</b> - Everyone in the server`;
 					`<b>{Settings.SpecialPrefix}admins</b> - All admins in the server`;
 					`<b>{Settings.SpecialPrefix}nonadmins</b> - Non-admins (normal players) in the server`;
 					`<b>{Settings.SpecialPrefix}others</b> - Everyone except yourself`;
 					`<b>{Settings.SpecialPrefix}random</b> - A random person in the server excluding those removed with -SELECTION`;
-					`<b>@USERNAME</b> - Targets a specific player with that exact username Ex: <b>{Settings.Prefix}god @Sceleratis </b> would give a player with the username 'Sceleratis' god powers`;
-					`<b>#NUM</b> - NUM random players in the server <b>{Settings.Prefix}ff #5</b> will ff 5 random players excluding those removed with -SELECTION.`;
+					`<b>@USERNAME</b> - Targets a specific player with that exact username Ex: <b>{Prefix}god @Sceleratis </b> would give a player with the username 'Sceleratis' god powers`;
+					`<b>#NUM</b> - NUM random players in the server <b>{Prefix}ff #5</b> will ff 5 random players excluding those removed with -SELECTION.`;
 					`<b>{Settings.SpecialPrefix}friends</b> - Your friends who are in the server`;
-					`<b>%TEAMNAME</b> - Members of the team TEAMNAME Ex: {Settings.Prefix}kill %raiders`;
+					`<b>%TEAMNAME</b> - Members of the team TEAMNAME Ex: {Prefix}kill %raiders`;
 					`<b>$GROUPID</b> - Members of the group with ID GROUPID (number in the Roblox group webpage URL)`;
-					`<b>-SELECTION</b> - Inverts the selection, ie. will remove SELECTION from list of players to run command on. {Settings.Prefix}kill all,-%TEAM will kill everyone except players on TEAM`;
-					`<b>+SELECTION</b> - Readds the selection, ie. will readd SELECTION from list of players to run command on. {Settings.Prefix}kill all,-%TEAM,+Lethalitics will kill everyone except players on TEAM but also Lethalitics`;
-					`<b>radius-NUM</b> -- Anyone within a NUM-stud radius of you. {Settings.Prefix}ff radius-5 will ff anyone within a 5-stud radius of you.`;
+					`<b>-SELECTION</b> - Inverts the selection, ie. will remove SELECTION from list of players to run command on. {Prefix}kill all,-%TEAM will kill everyone except players on TEAM`;
+					`<b>+SELECTION</b> - Readds the selection, ie. will readd SELECTION from list of players to run command on. {Prefix}kill all,-%TEAM,+Lethalitics will kill everyone except players on TEAM but also Lethalitics`;
+					`<b>radius-NUM</b> -- Anyone within a NUM-stud radius of you. {Prefix}ff radius-5 will ff anyone within a 5-stud radius of you.`;
 					"";
 					`<b>――――― Repetition ―――――</b>`;
-					`Multiple player selections - <b>{Settings.Prefix}kill me,noob1,noob2,{Settings.SpecialPrefix}random,%raiders,$123456,{Settings.SpecialPrefix}nonadmins,-scel</b>`;
-					`Multiple Commands at a time - <b>{Settings.Prefix}ff me {Settings.BatchKey} {Settings.Prefix}sparkles me {Settings.BatchKey} {Settings.Prefix}rocket jim</b>`;
-					`You can add a delay if you want; <b>{Settings.Prefix}ff me {Settings.BatchKey} !wait 10 {Settings.BatchKey} {Settings.Prefix}m hi we waited 10 seconds</b>`;
-					`<b>{Settings.Prefix}repeat 10(how many times to run the cmd) 1(how long in between runs) {Settings.Prefix}respawn jim</b>`;
+					`Multiple player selections - <b>{Prefix}kill me,noob1,noob2,{Settings.SpecialPrefix}random,%raiders,$123456,{Settings.SpecialPrefix}nonadmins,-scel</b>`;
+					`Multiple Commands at a time - <b>{Prefix}ff me {Settings.BatchKey} {Prefix}sparkles me {Settings.BatchKey} {Prefix}rocket jim</b>`;
+					`You can add a delay if you want; <b>{Prefix}ff me {Settings.BatchKey} !wait 10 {Settings.BatchKey} {Prefix}m hi we waited 10 seconds</b>`;
+					`<b>{Prefix}repeat 10(how many times to run the cmd) 1(how long in between runs) {Prefix}respawn jim</b>`;
 					"";
 					`<b>――――― Reference Info ―――――</b>`;
-					`<b>{Settings.Prefix}cmds</b> for a list of available commands`;
-					`<b>{Settings.Prefix}cmdinfo &lt;command&gt;</b> for detailed info about a specific command`;
+					`<b>{Prefix}cmds</b> for a list of available commands`;
+					`<b>{Prefix}cmdinfo &lt;command&gt;</b> for detailed info about a specific command`;
 					`<b>{Settings.PlayerPrefix}brickcolors</b> for a list of BrickColors`;
 					`<b>{Settings.PlayerPrefix}materials</b> for a list of materials`;
 					"";
-					`<b>{Settings.Prefix}capes</b> for a list of preset admin capes`;
-					`<b>{Settings.Prefix}musiclist</b> for a list of preset audios`;
-					`<b>{Settings.Prefix}insertlist</b> for a list of insertable assets using {Settings.Prefix}insert`;
+					`<b>{Prefix}capes</b> for a list of preset admin capes`;
+					`<b>{Prefix}musiclist</b> for a list of preset audios`;
+					`<b>{Prefix}insertlist</b> for a list of insertable assets using {Prefix}insert`;
 				}
 				Remote.MakeGui(plr, "List", {
 					Title = "Usage";
@@ -937,7 +938,7 @@ return function(Vargs, env)
 							IsDonor = Admin.CheckDonor(v);
 							GameData = gameData;
 							IsServerOwner = v.UserId == game.PrivateServerOwnerId;
-							CmdPrefix = Settings.Prefix;
+							CmdPrefix = Functions.GetMainPrefix();
 							CmdSplitKey = Settings.SplitKey;
 							OnlineFriends = Remote.Get(v, "Function", "GetFriendsOnline");
 						})
@@ -1018,7 +1019,7 @@ return function(Vargs, env)
 					ServerAge = service.FormatTime(os.time() - server.ServerStartTime);
 					ServerInternetInfo = serverInfo;
 					Refreshables = Logs.ListUpdaters.ServerDetails(plr);
-					CmdPrefix = Settings.Prefix;
+					CmdPrefix = if type(Settings.Prefix) == "table" then Settings.Prefix[1] else Settings.Prefix,
 					CmdPlayerPrefix = Settings.PlayerPrefix;
 					SplitKey = Settings.SplitKey;
 				})