diff --git a/Novetus/Novetus.Bootstrapper/LocalPaths.cs b/Novetus/Novetus.Bootstrapper/LocalPaths.cs index 3005387..c945751 100644 --- a/Novetus/Novetus.Bootstrapper/LocalPaths.cs +++ b/Novetus/Novetus.Bootstrapper/LocalPaths.cs @@ -24,6 +24,7 @@ namespace Novetus.Bootstrapper #region File Paths public static readonly string LauncherPath = FixedBinDir + "\\" + LauncherName; public static readonly string InfoPath = FixedConfigDir + "\\" + GlobalPaths.InfoName; + public static readonly string VersionTermList = FixedConfigDir + "\\" + GlobalPaths.TermListFileName; public static readonly string ConfigPath = FixedConfigDir + "\\" + GlobalPaths.ConfigName; #endregion } diff --git a/Novetus/Novetus.Bootstrapper/NovetusLaunchForm.cs b/Novetus/Novetus.Bootstrapper/NovetusLaunchForm.cs index 13c03be..f916bba 100644 --- a/Novetus/Novetus.Bootstrapper/NovetusLaunchForm.cs +++ b/Novetus/Novetus.Bootstrapper/NovetusLaunchForm.cs @@ -16,7 +16,9 @@ namespace Novetus.Bootstrapper private void NovetusLaunchForm_Load(object sender, EventArgs e) { - FileManagement.ReadInfoFile(LocalPaths.InfoPath, true, LocalPaths.LauncherPath); + FileManagement.ReadInfoFile(LocalPaths.InfoPath, + LocalPaths.VersionTermList, + LocalPaths.LauncherPath); ReadConfigValues(LocalPaths.ConfigPath); if (GlobalVars.UserConfiguration.BootstrapperShowUI) diff --git a/Novetus/NovetusCore/Classes/Downloader.cs b/Novetus/NovetusCore/Classes/Downloader.cs index 0553751..0d2fdbe 100644 --- a/Novetus/NovetusCore/Classes/Downloader.cs +++ b/Novetus/NovetusCore/Classes/Downloader.cs @@ -10,17 +10,17 @@ namespace Novetus.Core { #region Downloader - class Downloader + public class Downloader { - public readonly string fileURL; - public readonly string fileName; - public readonly string fileFilter; - public readonly string filePath; - public static bool showErrorInfo = true; - public static bool overwrite = true; + public string fileURL; + public string fileName; + public string fileFilter; + public string filePath; + public bool showErrorInfo = true; + public bool overwrite = true; public int downloadSize; private string downloadOutcome; - private static string downloadOutcomeException; + private string downloadOutcomeException; public Downloader(string url, string name, string filter) { @@ -44,18 +44,12 @@ namespace Novetus.Core fileFilter = ""; } - public void setDownloadOptions(bool ExtraErrorInfo, bool OverwriteFiles) - { - showErrorInfo = ExtraErrorInfo; - overwrite = OverwriteFiles; - } - public string getDownloadOutcome() { return downloadOutcome; } - public void InitDownloadDirect(string path, string fileext, string additionalText = "", bool removeSpaces = false) + public void InitDownloadDirect(string fileext, string additionalText = "", bool removeSpaces = false) { string outputfilename = ""; @@ -68,7 +62,7 @@ namespace Novetus.Core outputfilename = fileName + fileext; } - string fullpath = path + "\\" + outputfilename; + string fullpath = filePath + "\\" + outputfilename; InitDownloadNoDialog(fullpath, additionalText); } @@ -141,7 +135,7 @@ namespace Novetus.Core return filePath + Path.DirectorySeparatorChar + fileName; } - private static int DownloadFile(string remoteFilename, string localFilename) + private int DownloadFile(string remoteFilename, string localFilename) { //credit to Tom Archer (https://www.codeguru.com/columns/dotnettips/article.php/c7005/Downloading-Files-with-the-WebRequest-and-WebResponse-Classes.htm) //and Brokenglass (https://stackoverflow.com/questions/4567313/uncompressing-gzip-response-from-webclient/4567408#4567408) diff --git a/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs b/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs index ed1f6ba..616a0b5 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/FileManagement.cs @@ -201,6 +201,7 @@ namespace Novetus.Core RegisterClient1 = ""; RegisterClient2 = ""; DefaultMap = ""; + VersionName = ""; //HACK #if NET4 NetVersion = ".NET 4.0"; @@ -208,6 +209,7 @@ namespace Novetus.Core NetVersion = ".NET 4.8"; #endif InitialBootup = true; + IsSnapshot = false; } public string Version { get; set; } @@ -216,8 +218,10 @@ namespace Novetus.Core public string RegisterClient1 { get; set; } public string RegisterClient2 { get; set; } public string DefaultMap { get; set; } + public string VersionName { get; set; } public string NetVersion { get; set; } public bool InitialBootup { get; set; } + public bool IsSnapshot { get; set; } } #endregion } @@ -600,14 +604,39 @@ namespace Novetus.Core #region File Management public class FileManagement { - public static void ReadInfoFile(string infopath, bool other = false, string exepath = "") + public static string CreateVersionName(string termspath, int revision) + { + string rev = revision.ToString(); + + if (rev.Length > 0 && rev.Length >= 4) + { + string posString = rev.Substring(rev.Length - 4); + + int pos1 = int.Parse(posString.Substring(0, 2)); + int pos2 = int.Parse(posString.Substring(posString.Length - 2)); + + List termList = new List(); + termList.AddRange(File.ReadAllLines(termspath)); + + string firstTerm = (termList.ElementAtOrDefault(pos1 - 1) != null) ? termList[pos1 - 1] : termList.First(); + string lastTerm = (termList.ElementAtOrDefault(pos2 - 1) != null) ? termList[pos2 - 1] : termList.Last(); + + return firstTerm + " " + lastTerm; + } + + return "Invalid Revision"; + } + + public static void ReadInfoFile(string infopath, string termspath, string exepath = "") { //READ string versionbranch, defaultclient, defaultmap, regclient1, regclient2, extendedversionnumber, extendedversiontemplate, - extendedversionrevision, extendedversioneditchangelog, isLite, + extendedversionrevision, isSnapshot, initialBootup; + string verNumber = "Invalid File"; + INIFile ini = new INIFile(infopath); string section = "ProgramInfo"; @@ -619,10 +648,9 @@ namespace Novetus.Core regclient1 = ini.IniReadValue(section, "UserAgentRegisterClient1", "2007M"); regclient2 = ini.IniReadValue(section, "UserAgentRegisterClient2", "2009L"); extendedversionnumber = ini.IniReadValue(section, "ExtendedVersionNumber", "False"); - extendedversioneditchangelog = ini.IniReadValue(section, "ExtendedVersionEditChangelog", "False"); extendedversiontemplate = ini.IniReadValue(section, "ExtendedVersionTemplate", "%version%"); extendedversionrevision = ini.IniReadValue(section, "ExtendedVersionRevision", "-1"); - isLite = ini.IniReadValue(section, "IsLite", "False"); + isSnapshot = ini.IniReadValue(section, "IsSnapshot", "False"); initialBootup = ini.IniReadValue(section, "InitialBootup", "True"); try @@ -630,30 +658,27 @@ namespace Novetus.Core GlobalVars.ExtendedVersionNumber = Convert.ToBoolean(extendedversionnumber); if (GlobalVars.ExtendedVersionNumber) { - if (other) + if (!string.IsNullOrWhiteSpace(exepath)) { - if (!string.IsNullOrWhiteSpace(exepath)) - { - var versionInfo = FileVersionInfo.GetVersionInfo(exepath); - GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch) - .Replace("%build%", versionInfo.ProductBuildPart.ToString()) - .Replace("%revision%", versionInfo.FilePrivatePart.ToString()) - .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : "")); - } - else - { - return; - } + var versionInfo = FileVersionInfo.GetVersionInfo(exepath); + verNumber = CreateVersionName(termspath, versionInfo.FilePrivatePart); + GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch) + .Replace("%build%", versionInfo.ProductBuildPart.ToString()) + .Replace("%revision%", versionInfo.FilePrivatePart.ToString()) + .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : "")) + .Replace("%version-name%", verNumber); } else { + verNumber = CreateVersionName(termspath, Assembly.GetExecutingAssembly().GetName().Version.Revision); GlobalVars.ProgramInformation.Version = extendedversiontemplate.Replace("%version%", versionbranch) .Replace("%build%", Assembly.GetExecutingAssembly().GetName().Version.Build.ToString()) .Replace("%revision%", Assembly.GetExecutingAssembly().GetName().Version.Revision.ToString()) - .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : "")); + .Replace("%extended-revision%", (!extendedversionrevision.Equals("-1") ? extendedversionrevision : "")) + .Replace("%version-name%", verNumber); } - bool changelogedit = Convert.ToBoolean(extendedversioneditchangelog); + bool changelogedit = Convert.ToBoolean(isSnapshot); if (changelogedit) { @@ -680,6 +705,8 @@ namespace Novetus.Core GlobalVars.ProgramInformation.RegisterClient1 = regclient1; GlobalVars.ProgramInformation.RegisterClient2 = regclient2; GlobalVars.ProgramInformation.InitialBootup = Convert.ToBoolean(initialBootup); + GlobalVars.ProgramInformation.VersionName = verNumber; + GlobalVars.ProgramInformation.IsSnapshot = Convert.ToBoolean(isSnapshot); GlobalVars.UserConfiguration.SelectedClient = GlobalVars.ProgramInformation.DefaultClient; GlobalVars.UserConfiguration.Map = GlobalVars.ProgramInformation.DefaultMap; GlobalVars.UserConfiguration.MapPath = GlobalPaths.MapsDir + @"\\" + GlobalVars.ProgramInformation.DefaultMap; @@ -688,7 +715,7 @@ namespace Novetus.Core catch (Exception ex) { Util.LogExceptions(ex); - ReadInfoFile(infopath, other); + ReadInfoFile(infopath, termspath, exepath); } } diff --git a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs index fc95c47..bd39b52 100644 --- a/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs +++ b/Novetus/NovetusCore/StorageAndFunctions/GlobalPaths.cs @@ -119,6 +119,7 @@ namespace Novetus.Core public static readonly string ClientScriptDocumentationFileName = "documentation.txt"; public static readonly string AddonLoaderFileName = "AddonLoader.lua"; public static readonly string AssetFixerPatternFileName = "assetfixer_pattern.txt"; + public static readonly string TermListFileName = "term-list.txt"; #endregion } #endregion diff --git a/Novetus/NovetusLauncher/Forms/NovetusConsole.cs b/Novetus/NovetusLauncher/Forms/NovetusConsole.cs index b08938b..2e4514b 100644 --- a/Novetus/NovetusLauncher/Forms/NovetusConsole.cs +++ b/Novetus/NovetusLauncher/Forms/NovetusConsole.cs @@ -54,6 +54,10 @@ namespace NovetusLauncher private void NovetusConsole_Load(object sender, EventArgs e) { Util.ConsolePrint("Novetus version " + GlobalVars.ProgramInformation.Version + " loaded.", 4); + if (GlobalVars.ProgramInformation.IsSnapshot) + { + Util.ConsolePrint("Codename: " + GlobalVars.ProgramInformation.VersionName); + } Util.ConsolePrint("Novetus path: " + GlobalPaths.BasePath, 4); CryptoRandom random = new CryptoRandom(); string Name1 = GenerateName(random.Next(4, 12)); diff --git a/Novetus/NovetusLauncher/Forms/SDK/AssetFixer.cs b/Novetus/NovetusLauncher/Forms/SDK/AssetFixer.cs index fd8b1c0..94900bb 100644 --- a/Novetus/NovetusLauncher/Forms/SDK/AssetFixer.cs +++ b/Novetus/NovetusLauncher/Forms/SDK/AssetFixer.cs @@ -166,8 +166,10 @@ public partial class AssetFixer : Form if (!string.IsNullOrWhiteSpace(id)) { Downloader download = new Downloader(url, id); - download.setDownloadOptions(false, false); - download.InitDownloadDirect(path, fileext, "", true); + download.filePath = path; + download.showErrorInfo = false; + download.overwrite = false; + download.InitDownloadDirect(fileext, "", true); if (download.getDownloadOutcome().Contains("Error")) { Util.ConsolePrint("Download Outcome: " + download.getDownloadOutcome(), 2); diff --git a/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs b/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs index c374807..94ea42a 100644 --- a/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs +++ b/Novetus/NovetusLauncher/NovetusLauncherEntryPoint.cs @@ -46,7 +46,8 @@ namespace NovetusLauncher config.AddRuleForAllLevels(logfile); LogManager.Configuration = config; - FileManagement.ReadInfoFile(GlobalPaths.ConfigDir + "\\" + GlobalPaths.InfoName); + FileManagement.ReadInfoFile(GlobalPaths.ConfigDir + "\\" + GlobalPaths.InfoName, + GlobalPaths.ConfigDir + "\\" + GlobalPaths.TermListFileName); FileManagement.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, false); GlobalVars.ColorsLoaded = FileManagement.InitColors(); diff --git a/Novetus/NovetusURI/Forms/InstallForm.cs b/Novetus/NovetusURI/Forms/InstallForm.cs index 0904332..c1d5c41 100644 --- a/Novetus/NovetusURI/Forms/InstallForm.cs +++ b/Novetus/NovetusURI/Forms/InstallForm.cs @@ -19,7 +19,8 @@ namespace NovetusURI #region Form Events private void InstallForm_Load(object sender, EventArgs e) { - FileManagement.ReadInfoFile(GlobalPaths.ConfigDir + "\\" + GlobalPaths.InfoName, true, + FileManagement.ReadInfoFile(GlobalPaths.ConfigDir + "\\" + GlobalPaths.InfoName, + GlobalPaths.ConfigDir + "\\" + GlobalPaths.TermListFileName, GlobalPaths.RootPathLauncher + "\\Novetus.exe"); CenterToScreen(); } diff --git a/Novetus/NovetusURI/NovetusURI.cs b/Novetus/NovetusURI/NovetusURI.cs index f5b0483..b7d1b04 100644 --- a/Novetus/NovetusURI/NovetusURI.cs +++ b/Novetus/NovetusURI/NovetusURI.cs @@ -31,7 +31,8 @@ namespace NovetusURI config.AddRuleForAllLevels(logfile); LogManager.Configuration = config; - FileManagement.ReadInfoFile(GlobalPaths.ConfigDir + "\\" + GlobalPaths.InfoName); + FileManagement.ReadInfoFile(GlobalPaths.ConfigDir + "\\" + GlobalPaths.InfoName, + GlobalPaths.ConfigDir + "\\" + GlobalPaths.TermListFileName); FileManagement.Config(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigName, false); GlobalVars.ColorsLoaded = FileManagement.InitColors(); if (args.Length == 0) diff --git a/changelog.txt b/changelog.txt index a8364ae..f12be4d 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +Snapshot v23.8451.38416.1 +Enhancements: +- Added clean_junk.bat to allow the user to quickly reset their Novetus install. +- The Asset Web proxy extension now tries to download online assets for quicker asset loading on future map launches. +- Slightly increased asset loading times. +---------------------------------------------------------------------------- Snapshot v23.8428.35205.1 Notes: - Updated the year number from 22 to 23 in the version number. diff --git a/defaultaddons/novetusexts/webproxy/Asset.cs b/defaultaddons/novetusexts/webproxy/Asset.cs index 936136f..ab4808a 100644 --- a/defaultaddons/novetusexts/webproxy/Asset.cs +++ b/defaultaddons/novetusexts/webproxy/Asset.cs @@ -34,7 +34,6 @@ public class Asset : IWebProxyExtension if (string.IsNullOrWhiteSpace(id)) return; - Util.ConsolePrint(Name() + ": Local asset for " + id + " found. Using local asset.", 3); string First = pathList[0]; byte[] numArray = await Task.Run(() => File.ReadAllBytes(First)); e.Ok(numArray, NetFuncs.GenerateHeaders(((long) numArray.Length).ToString())); @@ -63,10 +62,11 @@ public class Asset : IWebProxyExtension public override async Task OnRequest(object sender, SessionEventArgs e) { string query = e.HttpClient.Request.RequestUri.Query; + string url = "https://assetdelivery.roblox.com/v1/asset/" + query; long id; if (!long.TryParse(NetFuncs.FindQueryString(query, "id"), out id)) { - e.Redirect("https://assetdelivery.roblox.com/v1/asset/" + query); + e.Redirect(url); } else { @@ -76,7 +76,19 @@ public class Asset : IWebProxyExtension if (!CanRedirectLocalAsset(GlobalPaths.AssetsPath, id, e)) { //Util.ConsolePrint(Name() + ": Cannot find " + id.ToString() + " in " + GlobalPaths.AssetsPath + ". Redirecting.", 2); - e.Redirect("https://assetdelivery.roblox.com/v1/asset/" + query); + e.Redirect(url); + + Downloader download = new Downloader(url, id.ToString()); + + download.filePath = GlobalPaths.AssetCacheDirAssets; + download.showErrorInfo = false; + download.overwrite = false; + download.InitDownloadDirect(""); + + if (!download.getDownloadOutcome().Contains("Error")) + { + Util.ConsolePrint(Name() + ": Localization of " + id.ToString() + " successful. Asset will be local on next launch.", 3); + } } } } diff --git a/scripts/batch/clean_junk.bat b/scripts/batch/clean_junk.bat index a194752..d91f835 100644 --- a/scripts/batch/clean_junk.bat +++ b/scripts/batch/clean_junk.bat @@ -1,132 +1,132 @@ @ECHO OFF -del /S Novetus\*.pdb -del /S Novetus\*.log -del /S Novetus\*.bak +del /S *.pdb +del /S *.log +del /S *.bak -del /s /q Novetus\clients\2007E\content\scripts\CSMPBoot.lua -del /s /q Novetus\clients\2007E-Shaders\content\scripts\CSMPBoot.lua -del /s /q Novetus\clients\2007M\content\scripts\CSMPBoot.lua -del /s /q Novetus\clients\2007M-Shaders\content\scripts\CSMPBoot.lua -del /s /q Novetus\clients\2006S\content\scripts\CSMPBoot.lua -del /s /q Novetus\clients\2006S-Shaders\content\scripts\CSMPBoot.lua -del /s /q Novetus\clients\ClientScriptTester\content\scripts\CSMPBoot.lua +del /s /q clients\2007E\content\scripts\CSMPBoot.lua +del /s /q clients\2007E-Shaders\content\scripts\CSMPBoot.lua +del /s /q clients\2007M\content\scripts\CSMPBoot.lua +del /s /q clients\2007M-Shaders\content\scripts\CSMPBoot.lua +del /s /q clients\2006S\content\scripts\CSMPBoot.lua +del /s /q clients\2006S-Shaders\content\scripts\CSMPBoot.lua +del /s /q clients\ClientScriptTester\content\scripts\CSMPBoot.lua -del /s /q Novetus\clients\2006S\ReShade.ini -del /s /q Novetus\clients\2006S\OPENGL32.log -del /s /q Novetus\clients\2006S\opengl32.dll -del /s /q Novetus\clients\2006S\DefaultPreset.ini -del /s /q Novetus\clients\2006S\content\temp.rbxl +del /s /q clients\2006S\ReShade.ini +del /s /q clients\2006S\OPENGL32.log +del /s /q clients\2006S\opengl32.dll +del /s /q clients\2006S\DefaultPreset.ini +del /s /q clients\2006S\content\temp.rbxl -del /s /q Novetus\clients\2006S-Shaders\ReShade.ini -del /s /q Novetus\clients\2006S-Shaders\OPENGL32.log -del /s /q Novetus\clients\2006S-Shaders\opengl32.dll -del /s /q Novetus\clients\2006S-Shaders\DefaultPreset.ini -del /s /q Novetus\clients\2006S-Shaders\content\temp.rbxl +del /s /q clients\2006S-Shaders\ReShade.ini +del /s /q clients\2006S-Shaders\OPENGL32.log +del /s /q clients\2006S-Shaders\opengl32.dll +del /s /q clients\2006S-Shaders\DefaultPreset.ini +del /s /q clients\2006S-Shaders\content\temp.rbxl -del /s /q Novetus\clients\2007E\ReShade.ini -del /s /q Novetus\clients\2007E\OPENGL32.log -del /s /q Novetus\clients\2007E\opengl32.dll -del /s /q Novetus\clients\2007E\DefaultPreset.ini -del /s /q Novetus\clients\2007E\content\temp.rbxl +del /s /q clients\2007E\ReShade.ini +del /s /q clients\2007E\OPENGL32.log +del /s /q clients\2007E\opengl32.dll +del /s /q clients\2007E\DefaultPreset.ini +del /s /q clients\2007E\content\temp.rbxl -del /s /q Novetus\clients\2007E-Shaders\ReShade.ini -del /s /q Novetus\clients\2007E-Shaders\OPENGL32.log -del /s /q Novetus\clients\2007E-Shaders\opengl32.dll -del /s /q Novetus\clients\2007E-Shaders\DefaultPreset.ini -del /s /q Novetus\clients\2007E-Shaders\content\temp.rbxl +del /s /q clients\2007E-Shaders\ReShade.ini +del /s /q clients\2007E-Shaders\OPENGL32.log +del /s /q clients\2007E-Shaders\opengl32.dll +del /s /q clients\2007E-Shaders\DefaultPreset.ini +del /s /q clients\2007E-Shaders\content\temp.rbxl -del /s /q Novetus\clients\2007M\ReShade.ini -del /s /q Novetus\clients\2007M\OPENGL32.log -del /s /q Novetus\clients\2007M\opengl32.dll -del /s /q Novetus\clients\2007M\DefaultPreset.ini -del /s /q Novetus\clients\2007M\content\temp.rbxl +del /s /q clients\2007M\ReShade.ini +del /s /q clients\2007M\OPENGL32.log +del /s /q clients\2007M\opengl32.dll +del /s /q clients\2007M\DefaultPreset.ini +del /s /q clients\2007M\content\temp.rbxl -del /s /q Novetus\clients\2007M-Shaders\ReShade.ini -del /s /q Novetus\clients\2007M-Shaders\OPENGL32.log -del /s /q Novetus\clients\2007M-Shaders\opengl32.dll -del /s /q Novetus\clients\2007M-Shaders\DefaultPreset.ini -del /s /q Novetus\clients\2007M-Shaders\content\temp.rbxl +del /s /q clients\2007M-Shaders\ReShade.ini +del /s /q clients\2007M-Shaders\OPENGL32.log +del /s /q clients\2007M-Shaders\opengl32.dll +del /s /q clients\2007M-Shaders\DefaultPreset.ini +del /s /q clients\2007M-Shaders\content\temp.rbxl -del /s /q Novetus\clients\2008M\ReShade.ini -del /s /q Novetus\clients\2008M\OPENGL32.log -del /s /q Novetus\clients\2008M\opengl32.dll -del /s /q Novetus\clients\2008M\DefaultPreset.ini -del /s /q Novetus\clients\2008M\content\temp.rbxl +del /s /q clients\2008M\ReShade.ini +del /s /q clients\2008M\OPENGL32.log +del /s /q clients\2008M\opengl32.dll +del /s /q clients\2008M\DefaultPreset.ini +del /s /q clients\2008M\content\temp.rbxl -del /s /q Novetus\clients\2009E\ReShade.ini -del /s /q Novetus\clients\2009E\OPENGL32.log -del /s /q Novetus\clients\2009E\opengl32.dll -del /s /q Novetus\clients\2009E\DefaultPreset.ini -del /s /q Novetus\clients\2009E\content\temp.rbxl +del /s /q clients\2009E\ReShade.ini +del /s /q clients\2009E\OPENGL32.log +del /s /q clients\2009E\opengl32.dll +del /s /q clients\2009E\DefaultPreset.ini +del /s /q clients\2009E\content\temp.rbxl -del /s /q Novetus\clients\2009E-HD\ReShade.ini -del /s /q Novetus\clients\2009E-HD\OPENGL32.log -del /s /q Novetus\clients\2009E-HD\opengl32.dll -del /s /q Novetus\clients\2009E-HD\DefaultPreset.ini -del /s /q Novetus\clients\2009E-HD\content\temp.rbxl +del /s /q clients\2009E-HD\ReShade.ini +del /s /q clients\2009E-HD\OPENGL32.log +del /s /q clients\2009E-HD\opengl32.dll +del /s /q clients\2009E-HD\DefaultPreset.ini +del /s /q clients\2009E-HD\content\temp.rbxl -del /s /q Novetus\clients\2009L\ReShade.ini -del /s /q Novetus\clients\2009L\OPENGL32.log -del /s /q Novetus\clients\2009L\opengl32.dll -del /s /q Novetus\clients\2009L\DefaultPreset.ini -del /s /q Novetus\clients\2009L\content\temp.rbxl +del /s /q clients\2009L\ReShade.ini +del /s /q clients\2009L\OPENGL32.log +del /s /q clients\2009L\opengl32.dll +del /s /q clients\2009L\DefaultPreset.ini +del /s /q clients\2009L\content\temp.rbxl -del /s /q Novetus\clients\2010L\ReShade.ini -del /s /q Novetus\clients\2010L\OPENGL32.log -del /s /q Novetus\clients\2010L\opengl32.dll -del /s /q Novetus\clients\2010L\DefaultPreset.ini -del /s /q Novetus\clients\2010L\content\temp.rbxl +del /s /q clients\2010L\ReShade.ini +del /s /q clients\2010L\OPENGL32.log +del /s /q clients\2010L\opengl32.dll +del /s /q clients\2010L\DefaultPreset.ini +del /s /q clients\2010L\content\temp.rbxl -del /s /q Novetus\clients\2011E\ReShade.ini -del /s /q Novetus\clients\2011E\OPENGL32.log -del /s /q Novetus\clients\2011E\opengl32.dll -del /s /q Novetus\clients\2011E\DefaultPreset.ini -del /s /q Novetus\clients\2011E\content\temp.rbxl +del /s /q clients\2011E\ReShade.ini +del /s /q clients\2011E\OPENGL32.log +del /s /q clients\2011E\opengl32.dll +del /s /q clients\2011E\DefaultPreset.ini +del /s /q clients\2011E\content\temp.rbxl -del /s /q Novetus\clients\2011M\ReShade.ini -del /s /q Novetus\clients\2011M\OPENGL32.log -del /s /q Novetus\clients\2011M\opengl32.dll -del /s /q Novetus\clients\2011M\DefaultPreset.ini -del /s /q Novetus\clients\2011M\content\temp.rbxl +del /s /q clients\2011M\ReShade.ini +del /s /q clients\2011M\OPENGL32.log +del /s /q clients\2011M\opengl32.dll +del /s /q clients\2011M\DefaultPreset.ini +del /s /q clients\2011M\content\temp.rbxl -del /s /q Novetus\clients\2012M\ReShade.ini -del /s /q Novetus\clients\2012M\OPENGL32.log -del /s /q Novetus\clients\2012M\opengl32.dll -del /s /q Novetus\clients\2012M\DefaultPreset.ini -del /s /q Novetus\clients\2012M\content\temp.rbxl +del /s /q clients\2012M\ReShade.ini +del /s /q clients\2012M\OPENGL32.log +del /s /q clients\2012M\opengl32.dll +del /s /q clients\2012M\DefaultPreset.ini +del /s /q clients\2012M\content\temp.rbxl -del /s /q Novetus\clients\ClientScriptTester\ReShade.ini -del /s /q Novetus\clients\ClientScriptTester\OPENGL32.log -del /s /q Novetus\clients\ClientScriptTester\opengl32.dll -del /s /q Novetus\clients\ClientScriptTester\DefaultPreset.ini -del /s /q Novetus\clients\ClientScriptTester\content\temp.rbxl +del /s /q clients\ClientScriptTester\ReShade.ini +del /s /q clients\ClientScriptTester\OPENGL32.log +del /s /q clients\ClientScriptTester\opengl32.dll +del /s /q clients\ClientScriptTester\DefaultPreset.ini +del /s /q clients\ClientScriptTester\content\temp.rbxl -del /s /q Novetus\config\servers.txt -del /s /q Novetus\config\ports.txt -del /s /q Novetus\config\saved.txt -del /s /q Novetus\config\ReShade.ini -del /s /q Novetus\config\config.ini -del /s /q Novetus\config\config_customization.ini -del /s /q Novetus\config\initialfilelist.txt -del /s /q Novetus\config\BadgeDatabase.ini +del /s /q config\servers.txt +del /s /q config\ports.txt +del /s /q config\saved.txt +del /s /q config\ReShade.ini +del /s /q config\config.ini +del /s /q config\config_customization.ini +del /s /q config\initialfilelist.txt +del /s /q config\BadgeDatabase.ini -del /s /q Novetus\config\clients\GlobalSettings2_2007E.xml -del /s /q Novetus\config\clients\GlobalSettings2_2007E-Shaders.xml -del /s /q Novetus\config\clients\GlobalSettings_4_2009E.xml -del /s /q Novetus\config\clients\GlobalSettings_4_2009E-HD.xml -del /s /q Novetus\config\clients\GlobalSettings_4_2010L.xml -del /s /q Novetus\config\clients\GlobalSettings_4_2011E.xml -del /s /q Novetus\config\clients\GlobalSettings_4_2011M.xml -del /s /q Novetus\config\clients\GlobalSettings2_2006S.xml -del /s /q Novetus\config\clients\GlobalSettings2_2006S-Shaders.xml -del /s /q Novetus\config\clients\GlobalSettings4_2007M.xml -del /s /q Novetus\config\clients\GlobalSettings4_2007M-Shaders.xml -del /s /q Novetus\config\clients\GlobalSettings7_2008M.xml -del /s /q Novetus\config\clients\GlobalSettings_13_2012M.xml -del /s /q Novetus\config\clients\GlobalSettings_4_2009L.xml +del /s /q config\clients\GlobalSettings2_2007E.xml +del /s /q config\clients\GlobalSettings2_2007E-Shaders.xml +del /s /q config\clients\GlobalSettings_4_2009E.xml +del /s /q config\clients\GlobalSettings_4_2009E-HD.xml +del /s /q config\clients\GlobalSettings_4_2010L.xml +del /s /q config\clients\GlobalSettings_4_2011E.xml +del /s /q config\clients\GlobalSettings_4_2011M.xml +del /s /q config\clients\GlobalSettings2_2006S.xml +del /s /q config\clients\GlobalSettings2_2006S-Shaders.xml +del /s /q config\clients\GlobalSettings4_2007M.xml +del /s /q config\clients\GlobalSettings4_2007M-Shaders.xml +del /s /q config\clients\GlobalSettings7_2008M.xml +del /s /q config\clients\GlobalSettings_13_2012M.xml +del /s /q config\clients\GlobalSettings_4_2009L.xml -del /s /q Novetus\bin\rootCert.pfx +del /s /q bin\rootCert.pfx -rmdir /s /q Novetus\maps\Custom -rmdir /s /q Novetus\shareddata\assetcache -rmdir /s /q Novetus\logs \ No newline at end of file +rmdir /s /q maps\Custom +rmdir /s /q shareddata\assetcache +rmdir /s /q logs \ No newline at end of file diff --git a/scripts/batch/github_sync.bat b/scripts/batch/github_sync.bat index 0b658e7..d98fdb1 100644 --- a/scripts/batch/github_sync.bat +++ b/scripts/batch/github_sync.bat @@ -129,6 +129,7 @@ XCOPY "%cd%\Novetus\config\splashes-special.txt" "%launcherscriptdir%" /y XCOPY "%cd%\Novetus\config\names-special.txt" "%launcherscriptdir%" /y XCOPY "%cd%\Novetus\config\info.ini" "%launcherscriptdir%" /y XCOPY "%cd%\Novetus\config\FileDeleteFilter.txt" "%launcherscriptdir%" /y +XCOPY "%cd%\Novetus\config\term-list.txt" "%launcherscriptdir%" /y echo. echo Moving client scripts, libraries, and configurations to GitHub folder... @@ -159,7 +160,7 @@ echo. echo Coying additional files to GitHub folder... if not exist "%dest%\scripts\batch" mkdir "%scriptsdir%\batch" XCOPY "%cd%\dev_menu.bat" "%scriptsdir%\batch" /y -XCOPY "%cd%\clean_junk.bat" "%scriptsdir%\batch" /y +XCOPY "%cd%\Novetus\clean_junk.bat" "%scriptsdir%\batch" /y XCOPY "%cd%\github_sync.bat" "%scriptsdir%\batch" /y XCOPY "%cd%\assetfixer_gauntlet.lua" "%scriptsdir%" /y XCOPY "%cd%\Novetus\Novetus_dependency_installer.bat" "%scriptsdir%\batch" /y diff --git a/scripts/launcher/Appreciation.rbxl b/scripts/launcher/Appreciation.rbxl index 689b2b5..bda8c7d 100644 --- a/scripts/launcher/Appreciation.rbxl +++ b/scripts/launcher/Appreciation.rbxl @@ -3,8 +3,9 @@ nil + 0 + true RBX1 - 56.700002957135439 0 0 @@ -25,6 +26,8 @@ + 0 + true 0 0 @@ -43,7 +46,7 @@ RBX4 true - + true -0.5 @@ -70,6 +73,9 @@ 1 true + 0 + true + false 0.5 1 0.300000012 @@ -82,7 +88,6 @@ 0 0 true - 256 Part 0 -0.5 @@ -112,40 +117,42 @@ 64 - + BadgeID 2018 true - + false Script - print("Badge Awarder Loaded. BadgeID:" .. script.Parent.BadgeID.Value) + print("Badge Awarder Loaded. BadgeID:" .. script.Parent.BadgeID.Value) -- ROBLOX scripter hackers, see what you can do with this: -- game:GetService("BadgeService"):UserHasBadge(userid, badgeid) function OnTouch(part) if (part.Parent:FindFirstChild("Humanoid") ~= nil) then - local p = game.Players:GetPlayerFromCharacter(part.Parent) - if (p ~= nil) then - print("Awarding BadgeID: " ..script.Parent.BadgeID.Value .. " to UserID: " .. p.userId) - local b = game:GetService("BadgeService") - b:AwardBadge(p.userId, script.Parent.BadgeID.Value) - end + pcall(function() + local p = game.Players:GetPlayerFromCharacter(part.Parent) + if (p ~= nil) then + print("Awarding BadgeID: " ..script.Parent.BadgeID.Value .. " to UserID: " .. p.userId) + local b = game:GetService("BadgeService") + b:AwardBadge(p.userId, script.Parent.BadgeID.Value) + end + end) end end -script.Parent.Touched:connect(OnTouch) +script.Parent.Touched:connect(OnTouch) true - + true -0.5 @@ -172,6 +179,9 @@ script.Parent.Touched:connect(OnTouch) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -184,7 +194,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -215,7 +224,7 @@ script.Parent.Touched:connect(OnTouch) - + true -0.5 @@ -242,6 +251,81 @@ script.Parent.Touched:connect(OnTouch) 0 true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 2 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 25 + 1.20000005 + 13 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 37 + + 31.5 + 7.69982529 + -28 + -1 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 0 + + true + 0 + true + false 0.5 1 0.300000012 @@ -254,7 +338,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -286,76 +369,6 @@ script.Parent.Touched:connect(OnTouch) - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 37 - - 31.5 - 7.69982529 - -28 - -1 - 0 - 0 - 0 - 0 - 1 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 2 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 25 - 1.20000005 - 13 - - - - true -0.5 @@ -382,6 +395,9 @@ script.Parent.Touched:connect(OnTouch) 0 false + 0 + true + false 0.5 1 0.300000012 @@ -394,7 +410,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -426,8 +441,10 @@ script.Parent.Touched:connect(OnTouch) - + + 0 + true 0 0 @@ -443,10 +460,10 @@ script.Parent.Touched:connect(OnTouch) 1 Bitl - RBX13 + RBX12 true - + true -0.5 @@ -473,6 +490,9 @@ script.Parent.Touched:connect(OnTouch) -1 true + 0 + true + false 0.5 1 0.300000012 @@ -485,7 +505,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Head 0 -0.5 @@ -515,18 +534,11 @@ script.Parent.Touched:connect(OnTouch) 1 - + - 2 - 2 0 Mesh - - 0 - 0 - 0 - 1.25 1.25 @@ -541,7 +553,7 @@ script.Parent.Touched:connect(OnTouch) true - + 5 face @@ -552,7 +564,7 @@ script.Parent.Touched:connect(OnTouch) - + true -0.5 @@ -579,6 +591,9 @@ script.Parent.Touched:connect(OnTouch) -1 true + 0 + true + false 0.5 1 0.300000012 @@ -591,7 +606,6 @@ script.Parent.Touched:connect(OnTouch) 2 0 true - 256 Torso 0 0 @@ -621,7 +635,7 @@ script.Parent.Touched:connect(OnTouch) 1 - + 5 Decal @@ -632,7 +646,7 @@ script.Parent.Touched:connect(OnTouch) - + true -0.5 @@ -659,6 +673,9 @@ script.Parent.Touched:connect(OnTouch) -1 true + 0 + true + false 0.5 1 0.300000012 @@ -671,7 +688,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Left Arm 0 -0.5 @@ -702,6 +718,78 @@ script.Parent.Touched:connect(OnTouch) + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 199 + + 1.5 + 4.20000029 + -5.5 + -1 + 0 + -0 + -0 + 1 + -0 + -0 + 0 + -1 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Right Arm + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 1 + 2 + 1 + + + true @@ -711,12 +799,12 @@ script.Parent.Touched:connect(OnTouch) 0 -0.5 0.5 - 4 + 0 0 - 199 + 21 - 1.5 - 4.20000029 + 3.5 + 2.20000005 -5.5 -1 0 @@ -729,6 +817,9 @@ script.Parent.Touched:connect(OnTouch) -1 true + 0 + true + false 0.5 1 0.300000012 @@ -741,8 +832,7 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 - Right Arm + Left Leg 0 -0.5 0.5 @@ -783,9 +873,9 @@ script.Parent.Touched:connect(OnTouch) 0.5 0 0 - 21 + 199 - 3.5 + 2.5 2.20000005 -5.5 -1 @@ -799,6 +889,9 @@ script.Parent.Touched:connect(OnTouch) -1 true + 0 + true + false 0.5 1 0.300000012 @@ -811,8 +904,7 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 - Left Leg + Right Leg 0 -0.5 0.5 @@ -843,76 +935,6 @@ script.Parent.Touched:connect(OnTouch) - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - 199 - - 2.5 - 2.20000005 - -5.5 - -1 - 0 - -0 - -0 - 1 - -0 - -0 - 0 - -1 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Right Leg - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 1 - 2 - 1 - - - - true -0.5 @@ -939,6 +961,9 @@ script.Parent.Touched:connect(OnTouch) 1 true + 0 + true + false 0.5 1 0.300000012 @@ -951,7 +976,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Hat 0 -0.5 @@ -981,18 +1005,11 @@ script.Parent.Touched:connect(OnTouch) 1 - + - 2 - 2 rbxasset://../../../shareddata/charcustom/hats/fonts/tophat.mesh 5 Mesh - - 0 - 0 - 0 - 1 1 @@ -1008,7 +1025,7 @@ script.Parent.Touched:connect(OnTouch) - + true -0.5 @@ -1035,6 +1052,9 @@ script.Parent.Touched:connect(OnTouch) 1 true + 0 + true + false 0.5 1 0.300000012 @@ -1047,7 +1067,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Swordpack 0 -0.5 @@ -1077,18 +1096,11 @@ script.Parent.Touched:connect(OnTouch) 1 - + - 2 - 2 rbxasset://../../../shareddata/charcustom/hats/fonts/Swordpack.mesh 5 Mesh - - 0 - 0 - 0 - 1 1 @@ -1105,8 +1117,10 @@ script.Parent.Touched:connect(OnTouch) - + + 0 + true 0 0 @@ -1122,10 +1136,10 @@ script.Parent.Touched:connect(OnTouch) 1 Icon - RBX28 + RBX26 true - + true -0.5 @@ -1152,6 +1166,9 @@ script.Parent.Touched:connect(OnTouch) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -1164,7 +1181,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -1195,7 +1211,7 @@ script.Parent.Touched:connect(OnTouch) - + true -0.5 @@ -1222,6 +1238,9 @@ script.Parent.Touched:connect(OnTouch) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -1234,7 +1253,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -1265,7 +1283,7 @@ script.Parent.Touched:connect(OnTouch) - + true -0.5 @@ -1292,6 +1310,9 @@ script.Parent.Touched:connect(OnTouch) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -1304,7 +1325,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -1335,7 +1355,7 @@ script.Parent.Touched:connect(OnTouch) - + true -0.5 @@ -1362,6 +1382,9 @@ script.Parent.Touched:connect(OnTouch) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -1374,7 +1397,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -1405,7 +1427,7 @@ script.Parent.Touched:connect(OnTouch) - + true -0.5 @@ -1432,6 +1454,9 @@ script.Parent.Touched:connect(OnTouch) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -1444,7 +1469,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -1476,8 +1500,10 @@ script.Parent.Touched:connect(OnTouch) - + + 0 + true 0 0 @@ -1496,7 +1522,7 @@ script.Parent.Touched:connect(OnTouch) RBX2 true - + true -0.5 @@ -1523,6 +1549,174 @@ script.Parent.Touched:connect(OnTouch) 0 true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 2 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 72 + 1.20000005 + 64 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 26 + + 4 + 33.1999588 + -29.2000008 + -1 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 0 + + false + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 2 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 72 + 1.20000005 + 64 + + + + + false + + DoorEnter + brick = script.Parent +messageText = "Epilepsy Warning: Flashing lights. Don't press the button if you've had a history of seizures." +message = Instance.new("Hint") +message.Name = "Warning" +message.Text = messageText + +function onHit(hit) + if (hit.Parent:findFirstChild("Humanoid") ~= nil) then + message.Parent = game.Workspace + end +end + +brick.Touched:connect(onHit) + true + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 26 + + -31.4000015 + 33.2000008 + -65.8000031 + 0 + -1 + 0 + 0 + 0 + 1 + -1 + 0 + 0 + + true + 0 + true + false 0.5 1 0.300000012 @@ -1535,7 +1729,6 @@ script.Parent.Touched:connect(OnTouch) 0 0 true - 256 Part 0 -0.5 @@ -1567,167 +1760,6 @@ script.Parent.Touched:connect(OnTouch) - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - 26 - - 4 - 33.1999588 - -29.2000008 - -1 - 0 - 0 - 0 - 0 - 1 - 0 - 1 - 0 - - false - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 2 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 72 - 1.20000005 - 64 - - - - - false - - DoorEnter - brick = script.Parent -messageText = "Epilepsy Warning: Flashing lights. Don't press the button if you've had a history of seizures." -message = Instance.new("Hint") -message.Name = "Warning" -message.Text = messageText - -function onHit(hit) - if (hit.Parent:findFirstChild("Humanoid") ~= nil) then - message.Parent = game.Workspace - end -end - -brick.Touched:connect(onHit) - true - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - 26 - - -31.4000015 - 33.2000008 - -65.8000031 - 0 - -1 - 0 - 0 - 0 - 1 - -1 - 0 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 2 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 72 - 1.20000005 - 64 - - - - true -0.5 @@ -1754,6 +1786,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -1766,7 +1801,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Panel 0 -0.5 @@ -1796,7 +1830,7 @@ brick.Touched:connect(onHit) 64 - + 4 Animation @@ -1807,7 +1841,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -1834,6 +1868,9 @@ brick.Touched:connect(onHit) 1 true + 0 + true + false 0.5 1 0.300000012 @@ -1846,7 +1883,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -1877,7 +1913,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -1904,6 +1940,9 @@ brick.Touched:connect(onHit) 1 true + 0 + true + false 0.5 1 0.300000012 @@ -1916,7 +1955,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 DanceFloor 0 -0.5 @@ -1947,7 +1985,7 @@ brick.Touched:connect(onHit) - + false -0.5 @@ -1974,6 +2012,9 @@ brick.Touched:connect(onHit) -1 true + 0 + true + false 0.5 1 0.300000012 @@ -1986,7 +2027,6 @@ brick.Touched:connect(onHit) 0 0 false - 256 Start 0 -0.5 @@ -2016,12 +2056,12 @@ brick.Touched:connect(onHit) 5 - + false ButtonPress - brick = script.Parent + brick = script.Parent animation = script.Parent.Parent.Panel.Animation dancefloor = script.Parent.Parent.DanceFloor messageText = "Art by Voreburger" @@ -2056,31 +2096,33 @@ function onHit(hit) if game.Workspace:findFirstChild("Warning") ~= nil then game.Workspace.Warning:remove() end - local p = game.Players:GetPlayerFromCharacter(hit.Parent) - if p ~= nil then - local b = game:GetService("BadgeService") - b:AwardBadge(p.userId, script.Parent.BadgeID.Value) - end + pcall(function() + local p = game.Players:GetPlayerFromCharacter(hit.Parent) + if p ~= nil then + local b = game:GetService("BadgeService") + b:AwardBadge(p.userId, script.Parent.BadgeID.Value) + end + end) antonymph() end end -brick.Touched:connect(onHit) +brick.Touched:connect(onHit) true - + true Antonymph - 1 + -1 false rbxasset://../../../shareddata/sounds/antonymph.mp3 1 true - + 1 Warning @@ -2090,7 +2132,7 @@ brick.Touched:connect(onHit) true - + BadgeID 42021 @@ -2099,8 +2141,10 @@ brick.Touched:connect(onHit) - + + 0 + true 0 0 @@ -2116,11 +2160,13 @@ brick.Touched:connect(onHit) 1 THANK YOU! - RBX49 + RBX45 true - + + 0 + true 0 0 @@ -2136,10 +2182,10 @@ brick.Touched:connect(onHit) 1 THANK - RBX49 + RBX45 true - + true -0.5 @@ -2166,6 +2212,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2178,7 +2227,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2209,7 +2257,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -2236,6 +2284,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2248,7 +2299,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2279,7 +2329,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -2306,6 +2356,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2318,7 +2371,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2349,7 +2401,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -2376,6 +2428,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2388,7 +2443,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2419,7 +2473,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -2446,6 +2500,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2458,7 +2515,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2489,7 +2545,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -2516,6 +2572,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2528,7 +2587,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2559,7 +2617,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -2586,6 +2644,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2598,7 +2659,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2629,7 +2689,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -2656,6 +2716,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2668,7 +2731,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2699,7 +2761,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -2726,6 +2788,369 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 1 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 14.5 + 17.2999954 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 1 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 11.5 + 19.3000126 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 5 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + -4.5 + 19.3000126 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 5 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 13.5 + 18.3000164 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 1 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 6.5 + 20.3000126 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false 0.5 1 0.300000012 @@ -2738,7 +3163,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2782,8 +3206,8 @@ brick.Touched:connect(onHit) 0 24 - 14.5 - 17.2999954 + 13.5 + 20.3000126 -6 0 0 @@ -2796,6 +3220,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -2808,7 +3235,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -2840,356 +3266,6 @@ brick.Touched:connect(onHit) - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 11.5 - 19.3000126 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 5 - 1.20000005 - 1 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - -4.5 - 19.3000126 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 5 - 1.20000005 - 1 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 13.5 - 18.3000164 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 1 - 1.20000005 - 1 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 6.5 - 20.3000126 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 1 - 1.20000005 - 1 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 13.5 - 20.3000126 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 1 - 1.20000005 - 1 - - - - true -0.5 @@ -3216,6 +3292,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -3228,7 +3307,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -3259,7 +3337,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -3286,6 +3364,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -3298,7 +3379,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -3329,7 +3409,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -3356,6 +3436,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -3368,7 +3451,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -3399,7 +3481,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -3426,6 +3508,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -3438,7 +3523,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -3469,7 +3553,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -3496,6 +3580,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -3508,7 +3595,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -3540,8 +3626,10 @@ brick.Touched:connect(onHit) - + + 0 + true 0 0 @@ -3557,10 +3645,10 @@ brick.Touched:connect(onHit) 1 YOU! - RBX72 + RBX67 true - + true -0.5 @@ -3587,6 +3675,441 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 1 + 1.20000005 + 3 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 5.5 + 13.7999964 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 4 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 12.5 + 11.3000002 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 1 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 12.5 + 14.2999907 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 3 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 9.5 + 13.7999964 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 4 + 1.20000005 + 1 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 1.5 + 11.3000002 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false + 0.5 + 1 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Part + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 3 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 1 + 1.20000005 + 3 + + + + + + true + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 4 + 0 + 24 + + 1.5 + 15.2999916 + -6 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + + true + 0 + true + false 0.5 1 0.300000012 @@ -3599,7 +4122,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -3631,426 +4153,6 @@ brick.Touched:connect(onHit) - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 5.5 - 13.7999964 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 4 - 1.20000005 - 1 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 12.5 - 11.3000002 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 1 - 1.20000005 - 1 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 12.5 - 14.2999907 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 3 - 1.20000005 - 1 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 9.5 - 13.7999964 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 4 - 1.20000005 - 1 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 1.5 - 11.3000002 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 1 - 1.20000005 - 3 - - - - - - true - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 4 - 0 - 24 - - 1.5 - 15.2999916 - -6 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 1 - 0 - - true - 0.5 - 1 - 0.300000012 - -0.5 - 0.5 - 0 - 0 - -0.5 - 0.5 - 0 - 0 - true - 256 - Part - 0 - -0.5 - 0.5 - 0 - 0 - - 0 - 0 - 0 - - -0.5 - 0.5 - 3 - 0 - 0 - - 0 - 0 - 0 - - true - 1 - - 1 - 1.20000005 - 3 - - - - true -0.5 @@ -4077,6 +4179,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -4089,7 +4194,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -4120,7 +4224,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -4147,6 +4251,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -4159,7 +4266,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -4190,7 +4296,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -4217,6 +4323,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -4229,7 +4338,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -4260,7 +4368,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -4287,6 +4395,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -4299,7 +4410,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -4330,7 +4440,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -4357,6 +4467,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -4369,7 +4482,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -4400,7 +4512,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -4427,6 +4539,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -4439,7 +4554,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -4470,7 +4584,7 @@ brick.Touched:connect(onHit) - + true -0.5 @@ -4497,6 +4611,9 @@ brick.Touched:connect(onHit) 0 true + 0 + true + false 0.5 1 0.300000012 @@ -4509,7 +4626,6 @@ brick.Touched:connect(onHit) 0 0 true - 256 Part 0 -0.5 @@ -4542,7 +4658,7 @@ brick.Touched:connect(onHit) - + false true @@ -4570,6 +4686,9 @@ brick.Touched:connect(onHit) 1 true + 0 + true + false 10 0.5 1 @@ -4583,7 +4702,6 @@ brick.Touched:connect(onHit) 2 0 true - 256 SpawnLocation true 0 @@ -4615,7 +4733,7 @@ brick.Touched:connect(onHit) 6 - + 1 Decal @@ -4635,13 +4753,13 @@ brick.Touched:connect(onHit) 79.5512619 42.0803528 0.859843254 - -0.337628365 - 0.382983953 - 2.98023224e-008 - 0.750128031 - 0.661292672 - -0.510558128 - -0.568608046 + -0.337628335 + 0.382983923 + -1.63399392e-008 + 0.750127971 + 0.661292732 + -0.510558069 + -0.568608105 0.644992471 @@ -4663,51 +4781,28 @@ brick.Touched:connect(onHit) - + Run Service true - - - Instance - true - - - - - ContentFilter - true - - - - - Instance - true - - - + RBX84 + RBX85 + 12 Players true - + StarterPack true - - - StarterGui - true - true - - - + 0 10 @@ -4716,88 +4811,85 @@ brick.Touched:connect(onHit) 1 true + RBX89 + RBX90 + RBX91 + RBX92 + RBX93 + RBX94 + RBX95 + RBX96 + RBX97 + RBX98 + RBX99 + RBX100 + RBX101 + RBX102 - + - CollectionService + Instance true - + PhysicsService true - + - BadgeService + Selection true - + + + Instance + true + + + RBX107 + Geometry true - - - RenderHooksService - true - - - - - SocialService - true - - - + 1000 Debris true - + Instance true - + - Instance - true - - - - - Selection - true - - - - - 4286611584 + 4286677377 1 4278190080 4278190080 41.7332993 Lighting - 4289967032 + 4290032825 14:00:00 true - + SkipSecurity 0 true - + Started false @@ -4805,34 +4897,18 @@ brick.Touched:connect(onHit) - + ChangeHistoryService true - - - Instance - true - - - + Teams true - - - Instance - true - - - - - Instance - true - - + RBX116 + RBX117 \ No newline at end of file diff --git a/scripts/launcher/info.ini b/scripts/launcher/info.ini index af946af..8bb2d85 100644 --- a/scripts/launcher/info.ini +++ b/scripts/launcher/info.ini @@ -4,10 +4,9 @@ DefaultClient=2009E DefaultMap=Dev - Baseplate2048.rbxl.bz2 UserAgentRegisterClient1=2007M UserAgentRegisterClient2=2010L +IsSnapshot=True ExtendedVersionNumber=True -ExtendedVersionEditChangelog=True -//ExtendedVersionTemplate=vX.23.%extended-revision% +//ExtendedVersionTemplate=vX.23.%extended-revision% (%version-name%) ExtendedVersionTemplate=Snapshot v23.%build%.%revision%.%extended-revision% ExtendedVersionRevision=1 InitialBootup=False -IsLite=False diff --git a/scripts/launcher/term-list.txt b/scripts/launcher/term-list.txt new file mode 100644 index 0000000..6ae555d --- /dev/null +++ b/scripts/launcher/term-list.txt @@ -0,0 +1,99 @@ +Turbo +Super +Ultra +Fire +Water +Earth +Stone +Ice +Jungle +Shadow +Magnet +Power +Plastic +Steel +Foil +Copper +Titanium +Diamond +Gold +Silver +Iron +Magnet +Bedrock +Lava +Meteor +Death +Life +Speed +Array +Constructor +Function +Method +Axis +Rotation +Position +Sector +Agent +Operative +Guardian +Twilight +Sparkle +Lighting +Thunder +Rainbow +Levitation +Cone +Pony +Horse +Pig +Bull +Sheep +Donkey +Bug +Cow +Cattle +Liquid +Solid +Gas +Cat +Dog +Fish +Axolotl +Crab +Dolphin +Shark +Anglerfish +Angler +Pufferfish +Puffer +Frog +Toad +Alligator +Crocodile +Brick +Block +Builder +Man +Minifig +Hero +Factory +Biological +Biology +Chronicle +Chronicler +History +Historian +Cyber +Cyberpunk +Retro +Spy +Future +Present +Volcano +Burger +Taco +Villager +Dinosaur +Code +United \ No newline at end of file