update github to latest snapshot changes.

Novetus/Novetus.Bootstrapper/LocalFuncs.cs

@@ -15,6 +15,7 @@ namespace Novetus.Bootstrapper
     {
         public static void LaunchApplicationExt(string filePath, string appName, string args = "")
         {
+            GlobalFuncs.Config(LocalPaths.ConfigPath, true);
             GlobalFuncs.LogPrint("Starting " + appName);
             try
             {

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 ConfigPath = FixedConfigDir + "\\" + GlobalPaths.ConfigName;
         #endregion
     }
     #endregion

Novetus/Novetus.Bootstrapper/NovetusLaunchForm.Designer.cs

@@ -42,6 +42,7 @@ namespace Novetus.Bootstrapper
             this.URIButton = new System.Windows.Forms.Button();
             this.VersionLabel = new System.Windows.Forms.Label();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.LauncherBox = new System.Windows.Forms.CheckBox();
             this.CMDGroup.SuspendLayout();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -90,7 +91,7 @@ namespace Novetus.Bootstrapper
             // 
             // DependencyInstallerButton
             // 
-            this.DependencyInstallerButton.Location = new System.Drawing.Point(30, 46);
+            this.DependencyInstallerButton.Location = new System.Drawing.Point(32, 42);
             this.DependencyInstallerButton.Name = "DependencyInstallerButton";
             this.DependencyInstallerButton.Size = new System.Drawing.Size(155, 23);
             this.DependencyInstallerButton.TabIndex = 5;
@@ -129,12 +130,13 @@ namespace Novetus.Bootstrapper
             // 
             // groupBox1
             // 
+            this.groupBox1.Controls.Add(this.LauncherBox);
             this.groupBox1.Controls.Add(this.URIButton);
             this.groupBox1.Controls.Add(this.LaunchSDKButton);
             this.groupBox1.Controls.Add(this.DependencyInstallerButton);
-            this.groupBox1.Location = new System.Drawing.Point(281, 195);
+            this.groupBox1.Location = new System.Drawing.Point(281, 191);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(216, 80);
+            this.groupBox1.Size = new System.Drawing.Size(216, 91);
             this.groupBox1.TabIndex = 7;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "Other Options";
@@ -172,6 +174,17 @@ namespace Novetus.Bootstrapper
             this.pictureBox1.TabIndex = 1;
             this.pictureBox1.TabStop = false;
             // 
+            // LauncherBox
+            // 
+            this.LauncherBox.AutoSize = true;
+            this.LauncherBox.Location = new System.Drawing.Point(51, 68);
+            this.LauncherBox.Name = "LauncherBox";
+            this.LauncherBox.Size = new System.Drawing.Size(120, 17);
+            this.LauncherBox.TabIndex = 7;
+            this.LauncherBox.Text = "Skip on next launch";
+            this.LauncherBox.UseVisualStyleBackColor = true;
+            this.LauncherBox.CheckedChanged += new System.EventHandler(this.LauncherBox_CheckedChanged);
+            // 
             // NovetusLaunchForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -192,6 +205,7 @@ namespace Novetus.Bootstrapper
             this.CMDGroup.ResumeLayout(false);
             this.CMDGroup.PerformLayout();
             this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.ResumeLayout(false);
 
@@ -211,6 +225,7 @@ namespace Novetus.Bootstrapper
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.Button URIButton;
         private System.Windows.Forms.Label VersionLabel;
+        private System.Windows.Forms.CheckBox LauncherBox;
     }
 }
 

Novetus/Novetus.Bootstrapper/NovetusLaunchForm.cs

@@ -15,35 +15,54 @@ namespace Novetus.Bootstrapper
 
         private void NovetusLaunchForm_Load(object sender, EventArgs e)
         {
-            //use novetus font for label!!
-
             GlobalFuncs.ReadInfoFile(LocalPaths.InfoPath, true, LocalPaths.LauncherPath);
+            ReadConfigValues(LocalPaths.ConfigPath);
 
-            //dammit windows 11...
+            if (GlobalVars.UserConfiguration.BootstrapperShowUI)
-            /*GlobalFuncs.LogPrint("Loading Font...");
-            try
             {
-                PrivateFontCollection pfc = new PrivateFontCollection();
+                //use novetus font for label!!
-                string fontPath = LocalPaths.FixedDataDir + "\\BootstrapperFont.ttf";
-                pfc.AddFontFile(fontPath);
 
-                foreach (var fam in pfc.Families)
+                //dammit windows 11...
+                /*GlobalFuncs.LogPrint("Loading Font...");
+                try
                 {
-                    VersionLabel.Font = new Font(fam, VersionLabel.Font.Size);
+                    PrivateFontCollection pfc = new PrivateFontCollection();
-                    LaunchNovetusButton.Font = new Font(fam, VersionLabel.Font.Size);
+                    string fontPath = LocalPaths.FixedDataDir + "\\BootstrapperFont.ttf";
-                }
+                    pfc.AddFontFile(fontPath);
-                GlobalFuncs.LogPrint("Font Loaded");
-            }
-            catch (Exception ex)
-            {
-                GlobalFuncs.LogExceptions(ex);
-            }*/
 
-            VersionLabel.Text = GlobalVars.ProgramInformation.Version.ToUpper();
+                    foreach (var fam in pfc.Families)
-            CenterToScreen();
+                    {
+                        VersionLabel.Font = new Font(fam, VersionLabel.Font.Size);
+                        LaunchNovetusButton.Font = new Font(fam, VersionLabel.Font.Size);
+                    }
+                    GlobalFuncs.LogPrint("Font Loaded");
+                }
+                catch (Exception ex)
+                {
+                    GlobalFuncs.LogExceptions(ex);
+                }*/
+
+                VersionLabel.Text = GlobalVars.ProgramInformation.Version.ToUpper();
+                CenterToScreen();
+            }
+            else
+            {
+                LaunchNovetus();
+            }
+        }
+
+        void ReadConfigValues(string cfgpath)
+        {
+            GlobalFuncs.Config(cfgpath, false);
+            LauncherBox.Checked = !GlobalVars.UserConfiguration.BootstrapperShowUI;
         }
 
         private void LaunchNovetusButton_Click(object sender, EventArgs e)
+        {
+            LaunchNovetus();
+        }
+
+        private void LaunchNovetus()
         {
             LocalFuncs.LaunchApplication(LocalPaths.LauncherName);
             Close();
@@ -77,5 +96,10 @@ namespace Novetus.Bootstrapper
             LocalFuncs.LaunchApplication(LocalPaths.URIName);
             Close();
         }
+
+        private void LauncherBox_CheckedChanged(object sender, EventArgs e)
+        {
+            GlobalVars.UserConfiguration.BootstrapperShowUI = !LauncherBox.Checked;
+        }
     }
 }

Novetus/NovetusCore/Classes/FileFormat.cs

@@ -75,6 +75,7 @@ public class FileFormat
             FirstServerLaunch = true;
             NewGUI = false;
             URIQuickConfigure = true;
+            BootstrapperShowUI = true;
         }
 
         public string SelectedClient { get; set; }
@@ -105,6 +106,7 @@ public class FileFormat
         public bool FirstServerLaunch { get; set; }
         public bool NewGUI { get; set; }
         public bool URIQuickConfigure { get; set; }
+        public bool BootstrapperShowUI { get; set; }
     }
     #endregion
 

Novetus/NovetusCore/StorageAndFunctions/GlobalFuncs.cs

@@ -254,6 +254,7 @@ public class GlobalFuncs
             ini.IniWriteValue(section, "FirstServerLaunch", GlobalVars.UserConfiguration.FirstServerLaunch.ToString());
             ini.IniWriteValue(section, "NewGUI", GlobalVars.UserConfiguration.NewGUI.ToString());
             ini.IniWriteValue(section, "URIQuickConfigure", GlobalVars.UserConfiguration.URIQuickConfigure.ToString());
+            ini.IniWriteValue(section, "BootstrapperShowUI", GlobalVars.UserConfiguration.BootstrapperShowUI.ToString());
             ConfigUseOldValIfExists(ini, section, "ItemMakerDisableHelpMessage", "AssetSDKDisableHelpMessage", GlobalVars.UserConfiguration.DisabledAssetSDKHelp.ToString(), write);
             ConfigUseOldValIfExists(ini, section, "AssetLocalizerSaveBackups", "AssetSDKFixerSaveBackups", GlobalVars.UserConfiguration.AssetSDKFixerSaveBackups.ToString(), write);
 
@@ -273,7 +274,7 @@ public class GlobalFuncs
                 disablehelpmessage, discord, mappath, mapsnip,
                 graphics, reshade, qualitylevel, style, savebackups, altIP, 
                 disReshadeDel, showNotifs, SB_Name, SB_Address, priority, 
-                firstServerLaunch, newgui, quickconfigure;
+                firstServerLaunch, newgui, quickconfigure, bootstrapper;
 
                 INIFile ini = new INIFile(cfgpath);
 
@@ -303,6 +304,7 @@ public class GlobalFuncs
                 firstServerLaunch = ini.IniReadValue(section, "FirstServerLaunch", GlobalVars.UserConfiguration.FirstServerLaunch.ToString());
                 newgui = ini.IniReadValue(section, "NewGUI", GlobalVars.UserConfiguration.NewGUI.ToString());
                 quickconfigure = ini.IniReadValue(section, "URIQuickConfigure", GlobalVars.UserConfiguration.URIQuickConfigure.ToString());
+                bootstrapper = ini.IniReadValue(section, "BootstrapperShowUI", GlobalVars.UserConfiguration.BootstrapperShowUI.ToString());
                 disablehelpmessage = ConfigUseOldValIfExists(ini, section, "ItemMakerDisableHelpMessage", "AssetSDKDisableHelpMessage", GlobalVars.UserConfiguration.DisabledAssetSDKHelp.ToString(), write);
                 savebackups = ConfigUseOldValIfExists(ini, section, "AssetLocalizerSaveBackups", "AssetSDKFixerSaveBackups", GlobalVars.UserConfiguration.AssetSDKFixerSaveBackups.ToString(), write);
 
@@ -347,6 +349,7 @@ public class GlobalFuncs
                 GlobalVars.UserConfiguration.FirstServerLaunch = ValueBool(firstServerLaunch, DefaultConfiguration.FirstServerLaunch);
                 GlobalVars.UserConfiguration.NewGUI = ValueBool(newgui, DefaultConfiguration.NewGUI);
                 GlobalVars.UserConfiguration.URIQuickConfigure = ValueBool(quickconfigure, DefaultConfiguration.URIQuickConfigure);
+                GlobalVars.UserConfiguration.BootstrapperShowUI = ValueBool(bootstrapper, DefaultConfiguration.BootstrapperShowUI);
 
                 string oldMapath = Path.GetDirectoryName(GlobalVars.UserConfiguration.MapPath);
                 //update the map path if the file doesn't exist and write to config.
@@ -385,6 +388,7 @@ public class GlobalFuncs
                 GlobalVars.PlayerTripcode = curval;
             }
 
+#if !BASICLAUNCHER
             if (!File.Exists(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization))
             {
                 Customization(GlobalPaths.ConfigDir + "\\" + GlobalPaths.ConfigNameCustomization, true);
@@ -395,6 +399,7 @@ public class GlobalFuncs
             }
 
             ReShade(GlobalPaths.ConfigDir, "ReShade.ini", write);
+#endif
         }
     }
 

changelog.txt

@@ -1,6 +1,19 @@
-1.3 Snapshot v22.8272.20133.2
+1.3 Snapshot v22.8282.21847.1
+Enhancements:
+- Added the following Place Contest (August 2022) entries:
+	Ironman_45 - MW2
+- Added the ability to skip the Bootstrapper on the next Novetus launch.
+
+Fixes:
+- Fixed issues with regenerating structures in Universal - Crossroads.
+----------------------------------------------------------------------------
+1.3 Snapshot v22.8272.20133.3
 Enhancements:
 - Improved the Media Feature Pack/Windows Media Player installation instructions in the Dependency Installer.
+- Added the Flood Fill plugin from later versions of 2012 to 2012M.
+
+Fixes:
+- Fixed 2012M zooming out the camera upon the first player respawn.
 ----------------------------------------------------------------------------
 1.3 Snapshot v22.8272.20133.2
 Fixes:

scripts/batch/Novetus_dependency_installer_lite.bat

@@ -85,11 +85,8 @@ goto REDISTINSTALLER
 
 :mfp
 CLS
-echo Please install the Media Feature Pack from Microsoft's website for your respective version of Windows.
+echo Please install the Windows Media Player through Windows' "Add a feature" utility.
-echo https://support.microsoft.com/en-us/topic/media-feature-pack-list-for-windows-n-editions-c1c6fffa-d052-8338-7a79-a4bb980a700a
+echo Windows 7+: Go to the Control Panel, Programs and Features, go to "Turn Windows features on and off", and enable Windows Media Player in Media Features.
-echo A web browser window to the site will pop up after you press a key.
+echo Windows 10+: Go to the Settings app, Apps, Optional Features, then search "Windows Media Player", then select it and press Install.
-echo Note: you can check what version you are on by goting to Settings, then System, then go down to About.
-pause
-start "" https://support.microsoft.com/en-us/topic/media-feature-pack-list-for-windows-n-editions-c1c6fffa-d052-8338-7a79-a4bb980a700a
 pause
 goto REDISTINSTALLER

scripts/game/2012M/CSMPFunctions.lua

@@ -1,4 +1,5 @@
 showServerNotifications = true
+RequestingMarker=true
 
 pcall(function() settings().Diagnostics:LegacyScriptMode() end)
 pcall(function() game:GetService("ScriptContext").ScriptsDisabled = false end)
@@ -587,6 +588,7 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 	pcall(function() dofile("rbxasset://..//..//..//addons//core//AddonLoader.lua") end)
 	pcall(function() _G.CSScript_PreInit("Server", "2012M") end)
 	pcall(function() game:SetPlaceID(-1, false) end)
+	game:GetService("ChangeHistoryService"):SetEnabled(false)
 	dofile("rbxasset://scripts\\cores\\StarterScriptServer.lua")
 	assert((type(Port)~="number" or tonumber(Port)~=nil or Port==nil),"CSRun Error: Port must be nil or a number.")
 	local NetworkServer=game:GetService("NetworkServer")
@@ -634,15 +636,14 @@ function CSServer(Port,PlayerLimit,ClientEXEMD5,LauncherMD5,ClientScriptMD5,Noti
 				game.Players:Chat("Player '" .. Player.Name .. "' joined")
 			end
 			Player:LoadCharacter()
-		end
-		
-		Player.CharacterAdded:connect(function(pchar)
 			LoadSecurity(newWaitForChildSecurity(Player,"Security"),Player,game.Lighting)
 			newWaitForChildSecurity(Player,"Tripcode")
 			LoadTripcode(Player)
 			pcall(function() print("Player '" .. Player.Name .. "-" .. Player.userId .. "' security check success. Tripcode: '" .. Player.Tripcode.Value .. "'") end)
-			LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"), pchar)
+			if (Player.Character ~= nil) then
-		end)
+				LoadCharacterNew(newWaitForChildSecurity(Player,"Appearance"), Player.Character)
+			end
+		end
 		
 		Player.Changed:connect(function(Property)
 			if (game.Lighting:findFirstChild("DisableRespawns") == nil) then
@@ -723,7 +724,6 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,He
 
 	local function ConnectionAccepted(Peer,Replicator)
 		Replicator.Disconnection:connect(Disconnection)
-		local RequestingMarker=true
 		game:SetMessageBrickCount()
 		local Marker=Replicator:SendMarker()
 		Marker.Received:connect(function()

scripts/launcher/info.ini

@@ -8,6 +8,6 @@ ExtendedVersionNumber=True
 ExtendedVersionEditChangelog=True
 //ExtendedVersionTemplate=%version% v8.2022.%extended-revision%%lite%
 ExtendedVersionTemplate=%version% Snapshot v22.%build%.%revision%.%extended-revision%
-ExtendedVersionRevision=2
+ExtendedVersionRevision=1
 IsLite=False
 InitialBootup=False

scripts/launcher/splashes.txt

@@ -229,3 +229,4 @@ ouch.ogg
 Macaroni, Macaroni, Macaroni, Macaroni!|Put the cheese in the middle, and what do you get?
 I dunno, they look like pancakes!|I don't think their pan-THEY'RE PANCAKES!
 I built a giant klayman.
+#!|a shebang!