Fix various issues.

Novetus/NovetusCore/Classes/WebProxy.cs

@@ -24,7 +24,8 @@ namespace Novetus.Core
         public virtual Task OnBeforeTunnelConnectRequest(object sender, TunnelConnectSessionEventArgs e) { return Task.FromResult(0); }
         public virtual async Task OnRequest(object sender, SessionEventArgs e) 
         {
-            e.Ok("Test successful. \nRunning Novetus " + GlobalVars.ProgramInformation.Version + " on " + GlobalVars.ProgramInformation.NetVersion);
+            string query = e.HttpClient.Request.RequestUri.Query;
+            e.Ok("Response to '" + query + "'\nTest successful. \nRunning Novetus " + GlobalVars.ProgramInformation.Version + " on " + GlobalVars.ProgramInformation.NetVersion);
         }
     }
 

Novetus/NovetusCore/StorageAndFunctions/ClientManagement.cs

@@ -1154,13 +1154,12 @@ namespace Novetus.Core
             ReadClientValues(ClientName);
             string luafile = GetLuaFileName(ClientName, type);
             string rbxexe = GetClientEXEDir(ClientName, type);
-            bool isEasterEgg = GlobalVars.Clicks >= 10;
             bool is3DView = (type.Equals(ScriptType.OutfitView));
             string mapfilepath = nomap ? (type.Equals(ScriptType.Studio) ? GlobalPaths.ConfigDir + "\\Place1.rbxl" : "") : GlobalVars.UserConfiguration.ReadSetting("MapPath");
             string mapfilename = nomap ? "" : GlobalVars.UserConfiguration.ReadSetting("Map");
-            string mapfile = isEasterEgg ? GlobalPaths.DataDir + "\\Appreciation.rbxl" :
+            string mapfile = (GlobalVars.EasterEggMode && type != ScriptType.Solo) ? GlobalPaths.DataDir + "\\Appreciation.rbxl" :
                 (is3DView ? GlobalPaths.DataDir + "\\3DView.rbxl" : mapfilepath);
-            string mapname = (isEasterEgg || is3DView) ? "" : mapfilename;
+            string mapname = ((GlobalVars.EasterEggMode && type != ScriptType.Solo) || is3DView) ? "" : mapfilename;
             FileFormat.ClientInfo info = GetClientInfoValues(ClientName);
             string quote = "\"";
             string args = "";
@@ -1476,8 +1475,7 @@ namespace Novetus.Core
                 string md5s = "'" + md5exe + "','" + md5dir + "','" + md5script + "'";
 
                 string serverIP = (type == ScriptType.SoloServer ? "localhost" : GlobalVars.CurrentServer.ServerIP);
-                int serverjoinport = (type == ScriptType.SoloServer ? GlobalVars.DefaultRobloxPort : GlobalVars.CurrentServer.ServerPort);
+                int serverjoinport = (type == ScriptType.Solo ? GlobalVars.UserConfiguration.ReadSettingInt("RobloxPort") : GlobalVars.CurrentServer.ServerPort);
-                string serverport = (type == ScriptType.SoloServer ? GlobalVars.DefaultRobloxPort.ToString() : GlobalVars.UserConfiguration.ReadSetting("RobloxPort"));
                 string playerLimit = (type == ScriptType.SoloServer ? "1" : GlobalVars.UserConfiguration.ReadSetting("PlayerLimit"));
                 string joinNotifs = (type == ScriptType.SoloServer ? "false" : GlobalVars.UserConfiguration.ReadSetting("ShowServerNotifications").ToLower());
 
@@ -1498,7 +1496,7 @@ namespace Novetus.Core
                     case ScriptType.Server:
                     case ScriptType.SoloServer:
                         return "_G.CSServer("
-                            + serverport + ","
+                            + GlobalVars.UserConfiguration.ReadSettingInt("RobloxPort") + ","
                             + playerLimit + ","
                             + md5s + ","
                             + joinNotifs

Novetus/NovetusCore/StorageAndFunctions/GlobalVars.cs

@@ -149,6 +149,7 @@ namespace Novetus.Core
         public static bool isConsoleOnly = false;
         public static bool isMapCompressed = false;
         public static int Clicks = 0;
+        public static bool EasterEggMode = false;
         #endregion
     }
     #endregion

Novetus/NovetusLauncher/Forms/LauncherForm/Compact/LauncherFormCompact.resx

@@ -136,7 +136,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
-        CQAAAk1TRnQBSQFMAgEBAgEAAZABAAGQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAZgBAAGYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs

@@ -369,7 +369,8 @@ namespace NovetusLauncher
                     ClientManagement.LaunchRBXClient(ScriptType.Server, no3d, false, new EventHandler(ServerExited));
                     break;
                 case ScriptType.Solo:
-                    var SoloEvent = GlobalVars.Clicks >= 10 ? new EventHandler(EasterEggExited) : new EventHandler(SoloExited);
+                    GlobalVars.EasterEggMode = (GlobalVars.Clicks >= 10);
+                    var SoloEvent = GlobalVars.EasterEggMode ? new EventHandler(EasterEggExited) : new EventHandler(SoloExited);
 
                     ClientManagement.LaunchRBXClient(ScriptType.SoloServer, false, false, new EventHandler(ServerExited));
                     await Task.Delay(1500);
@@ -471,10 +472,7 @@ namespace NovetusLauncher
         void EasterEggExited(object sender, EventArgs e)
         {
             SplashLabel.Text = LocalVars.prevsplash;
-            if (GlobalVars.AdminMode)
+            GlobalVars.EasterEggMode = false;
-            {
-                GlobalVars.Clicks = 0;
-            }
 
             SoloExperimentalExited(sender, e);
         }

changelog.txt

@@ -1,3 +1,10 @@
+EDGE Snapshot v23.8745.28516.1
+Enhancements:
+- Play Solo now uses the current server port (defined in the Host menu.)
+	- This makes it easier to launch Play Solo on some computers.
+Fixes:
+- Fixed the AwardBadge and HasBadge extensions not working properly.
+----------------------------------------------------------------------------
 EDGE Snapshot v23.8731.28487.3
 Fixes:
 - The 3D Preview now works properly in 2006S.

defaultaddons/novetusexts/webproxy/AwardBadge.cs

@@ -28,6 +28,10 @@ public class AwardBadge : IWebProxyExtension
     {
         CreateBadgeDatabaseIfNeeded();
         string BaseMapName = GlobalVars.UserConfiguration.ReadSetting("MapPathSnip").Replace(@"maps\\", "").Replace(".rbxl", "").Replace(".rbxlx", "").Replace(".bz2", "");
+        if (GlobalVars.EasterEggMode)
+        {
+            BaseMapName = "Appreciation";
+        }
         string BadgeName = BaseMapName + "_" + data.BadgeId.ToString() + "_" + (data.BadgeName.Replace(" ", "-")) + "_" + data.BadgeCreatorName;
         ini.IniWriteValue(BadgeDatabaseSection, BadgeName, Awarded.ToString());
     }
@@ -63,16 +67,16 @@ public class AwardBadge : IWebProxyExtension
         result.BadgeCreatorName = "Unknown";
         string metaFile = (GlobalVars.UserConfiguration.ReadSetting("MapPath").Replace(".rbxl", "").Replace(".rbxlx", "").Replace(".bz2", "") + MetadataFileExtension);
 
-        if (GlobalVars.GameOpened == ScriptType.EasterEgg)
+        if (GlobalVars.EasterEggMode)
         {
-            metaFile = ((GlobalPaths.DataDir + "\\Appreciation.rbxl").Replace(".rbxl", MetadataFileExtension));
+            metaFile = GlobalPaths.DataDir + "\\Appreciation_meta.ini";
         }
 
         if (File.Exists(metaFile))
         {
             try
             {
-                INIFile metaIni = new INIFile(metaFile);
+                INIFile metaIni = new INIFile(metaFile, false);
                 string section = BadgeID.ToString();
 
                 string name = metaIni.IniReadValue(section, "BadgeName", BadgeID.ToString());
@@ -105,7 +109,7 @@ public class AwardBadge : IWebProxyExtension
 
     public override string Version() 
     { 
-        return "1.0.1";
+        return "1.0.2";
     }
 
     public override string Author() 

defaultaddons/novetusexts/webproxy/HasBadge.cs

@@ -14,12 +14,17 @@ public class HasBadge : IWebProxyExtension
 {
     private static readonly string BadgeDatabasePath = GlobalPaths.ConfigDir + "\\BadgeDatabase.ini";
     private static readonly string BadgeDatabaseSection = "BadgeDatabase";
-    private INIFile ini = new INIFile(BadgeDatabasePath);
+    private INIFile ini = new INIFile(BadgeDatabasePath, false);
 
     public override string Name() 
     { 
         return "Badge Checker API Extension";
     }
+    
+    public override string Version() 
+    { 
+        return "1.0.1";
+    }
 
     public override string Author() 
     { 
@@ -32,8 +37,13 @@ public class HasBadge : IWebProxyExtension
 
         if (ini.IniValueExists(BadgeID.ToString()))
         {
-            string key = ini.IniGetKey(BadgeID.ToString());
+            string BaseMapName = GlobalVars.UserConfiguration.ReadSetting("MapPathSnip").Replace(@"maps\\", "").Replace(".rbxl", "").Replace(".rbxlx", "").Replace(".bz2", "");
-            string awarded = ini.IniReadValue(BadgeDatabaseSection, key, "False");
+            if (GlobalVars.EasterEggMode)
+            {
+                BaseMapName = "Appreciation";
+            }
+            string BadgeName = BaseMapName + "_" + data.BadgeId.ToString() + "_" + (data.BadgeName.Replace(" ", "-")) + "_" + data.BadgeCreatorName;
+            string awarded = ini.IniReadValue(BadgeDatabaseSection, BadgeName, "False");
             return Convert.ToBoolean(awarded);
         }
 

scripts/launcher/info.ini

@@ -9,6 +9,6 @@ ExtendedVersionNumber=True
 //ExtendedVersionTemplate=%version% vX.23.%extended-revision% (%version-name%)
 //ExtendedVersionTemplate=%version% Snapshot v23.%build%.%revision%.%extended-revision%
 ExtendedVersionTemplate=EDGE Snapshot v23.%build%.%revision%.%extended-revision%
-ExtendedVersionRevision=3
+ExtendedVersionRevision=1
 InitialBootup=False
 IsLite=False

scripts/launcher/splashes-special.txt

@@ -1,6 +1,6 @@
 Happy New Year!|Have a happy %year%!|1/1
 RIP Erik Cassel|Erik Cassel, was a co-founder, administrator%newline%and former VP of Engineering of Roblox.|2/11
-Blueheart Forever.|Dedicated to Pepper and Sophie.|4/14
+💙 Blueheart Forever.|Dedicated to Pepper and Sophie.|4/14
 smoke weed every day|blaze it|4/20
 Happy Birthday, Bitl!|Bitl is the developer of Novetus and RBXLegacy.|6/10
 Happy Pride Month!|6/1-6/30-6/7-6/15
@@ -12,6 +12,7 @@ Happy Birthday, Novetus!|Novetus was announced directly after the cancellation o
 Happy Halloween!|Spooky, scary skeletons send shivers down your spine...|10/31
 Adventure Awaits...|The first trailer used to promote Roblox to the public was%newline%uploaded by John Shedletsky on November 9th, 2006.|11/9
 Welcome to %version%!|Hi!|11/11
+💙|Dedicated to Pepper|11/29
 Merry Christmas!|...and a happy new year!|12/24-12/25
 Happy New Year!|Have a happy %nextyear%!|12/31
 Happy Out-of-Touch Thursday!|You're out of touch, I'm out of time.%newline%But I'm out of my head when you're not around!|Thursday