reverted to 2011m backpack ui temporarily. minor text changes.

Novetus/NovetusLauncher/Forms/LauncherFormSettings.Designer.cs

@@ -40,11 +40,11 @@
             this.label9 = new System.Windows.Forms.Label();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.button2 = new System.Windows.Forms.Button();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
             this.NewGUI2011MBox = new System.Windows.Forms.CheckBox();
             this.label1 = new System.Windows.Forms.Label();
             this.comboBox3 = new System.Windows.Forms.ComboBox();
-            this.button2 = new System.Windows.Forms.Button();
             this.groupBox1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBox3.SuspendLayout();
@@ -153,9 +153,12 @@
             this.label9.ForeColor = System.Drawing.Color.Red;
             this.label9.Location = new System.Drawing.Point(7, 136);
             this.label9.Name = "label9";
-            this.label9.Size = new System.Drawing.Size(411, 13);
+            this.label9.Size = new System.Drawing.Size(411, 39);
             this.label9.TabIndex = 84;
-            this.label9.Text = "Close this window to save your settings to the currently selected client.";
+            this.label9.Text = "Close this window to save your settings to the currently selected client.\r\nPlease" +
+    " note that your client may require up to 2 restarts before settings\r\nwill fully " +
+    "apply.\r\n";
+            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // groupBox1
             // 
@@ -186,6 +189,16 @@
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "Graphics Options";
             // 
+            // button2
+            // 
+            this.button2.Location = new System.Drawing.Point(8, 101);
+            this.button2.Name = "button2";
+            this.button2.Size = new System.Drawing.Size(191, 23);
+            this.button2.TabIndex = 84;
+            this.button2.Text = "Reset Graphics Options";
+            this.button2.UseVisualStyleBackColor = true;
+            this.button2.Click += new System.EventHandler(this.button2_Click);
+            // 
             // groupBox3
             // 
             this.groupBox3.BackColor = System.Drawing.SystemColors.ControlLightLight;
@@ -236,22 +249,12 @@
             this.comboBox3.TabIndex = 0;
             this.comboBox3.SelectedIndexChanged += new System.EventHandler(this.comboBox3_SelectedIndexChanged);
             // 
-            // button2
-            // 
-            this.button2.Location = new System.Drawing.Point(8, 101);
-            this.button2.Name = "button2";
-            this.button2.Size = new System.Drawing.Size(191, 23);
-            this.button2.TabIndex = 84;
-            this.button2.Text = "Reset Graphics Options";
-            this.button2.UseVisualStyleBackColor = true;
-            this.button2.Click += new System.EventHandler(this.button2_Click);
-            // 
             // LauncherFormSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.ControlLightLight;
-            this.ClientSize = new System.Drawing.Size(426, 154);
+            this.ClientSize = new System.Drawing.Size(426, 180);
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox1);

changelog.txt

@@ -1,3 +1,12 @@
+1.3 Snapshot v22.8270.27492.1
+Enhancements:
+- Added a notice to the settings panel regarding clients that need a secondary restart after applying settings.
+
+Fixes:
+- Fixed Truss Detail settings not working.
+- Switched to the 2011M corescripts to get weapon selection working in 2012M.
+	- Note that the extended backpack UI still doesn't function. If anyone finds a solution, let me know.
+----------------------------------------------------------------------------
 1.3 Snapshot v22.8270.18357.1
 Enhancements:
 - Added an alpha 2012M client!

scripts/game/2012M/cores/BackpackBuilder.lua

@@ -78,23 +78,6 @@ TempSlot.Parent = CurrentLoadout
 	GearReference.RobloxLocked = true
 	GearReference.Parent = TempSlot
 
-	local ToolTipLabel = Instance.new("TextLabel")
-	ToolTipLabel.Name = "ToolTipLabel"
-	ToolTipLabel.RobloxLocked = true
-	ToolTipLabel.Text = ""
-	ToolTipLabel.BackgroundTransparency = 0.5
-	ToolTipLabel.BorderSizePixel = 0
-	ToolTipLabel.Visible = false
-	ToolTipLabel.TextColor3 = Color3.new(1,1,1)
-	ToolTipLabel.BackgroundColor3 = Color3.new(0,0,0)
-	ToolTipLabel.TextStrokeTransparency = 0
-	ToolTipLabel.Font = Enum.Font.ArialBold
-	ToolTipLabel.FontSize = Enum.FontSize.Size14
-	--ToolTipLabel.TextWrap = true
-	ToolTipLabel.Size = UDim2.new(1,60,0,20)
-	ToolTipLabel.Position = UDim2.new(0,-30,0,-30)
-	ToolTipLabel.Parent = TempSlot
-
 	local Kill = Instance.new("BoolValue")
 	Kill.Name = "Kill"
 	Kill.RobloxLocked = true

scripts/game/2012M/cores/BackpackResizer.lua

@@ -4122,22 +4122,6 @@ function previewGear(button)
 	end
 end
 
-function findEmptySlot()
-	local smallestNum = nil
-	local loadout = currentLoadout:GetChildren()
-	for i = 1, #loadout do
-		if loadout[i]:IsA("Frame") and #loadout[i]:GetChildren() <= 0 then
-			local frameNum = tonumber(string.sub(loadout[i].Name,5))
-			if frameNum == 0 then frameNum = 10 end
-			if not smallestNum or (smallestNum > frameNum) then
-				smallestNum = frameNum
-			end
-		end
-	end
-	if smallestNum == 10 then smallestNum = 0 end
-	return smallestNum
-end
-
 function checkForSwap(button,x,y)
 	local loadoutChildren = currentLoadout:GetChildren()
 	for i = 1, #loadoutChildren do
@@ -4165,7 +4149,7 @@ function resizeGrid()
 				if buttonClone.Image == "" then
 					buttonClone.GearText.Text = v.Name
 				end
-
+				--print("v =",v)
 				buttonClone.GearReference.Value = v
 				buttonClone.Draggable = true 
 				buttons[v] = buttonClone
@@ -4181,8 +4165,8 @@ function resizeGrid()
 					beginPos = value
 				end)
 				buttonClone.DragStopped:connect(function(x,y)
-					buttonClone.ZIndex = 1
 					if beginPos ~= buttonClone.Position then
+						buttonClone.ZIndex = 1
 						if not checkForSwap(buttonClone,x,y) then
 							buttonClone:TweenPosition(beginPos,Enum.EasingDirection.Out, Enum.EasingStyle.Quad, 0.5, true)
 							buttonClone.Draggable = false
@@ -4194,21 +4178,9 @@ function resizeGrid()
 						end
 					end	
 				end)
-				local clickTime = tick()
+				
 				mouseEnterCons[buttonClone] = buttonClone.MouseEnter:connect(function() previewGear(buttonClone) end)
-				mouseClickCons[buttonClone] = buttonClone.MouseButton1Click:connect(function()
+				mouseClickCons[buttonClone] = buttonClone.MouseButton1Click:connect(function() buttonClick(buttonClone) end)
-					local newClickTime = tick()
-					if buttonClone.Active and (newClickTime - clickTime) < 0.5 then
-						local slot = findEmptySlot()
-						if slot then
-							buttonClone.ZIndex = 1
-							swapGearSlot(slot,buttonClone)
-						end
-					else
-						buttonClick(buttonClone)
-					end
-					clickTime = newClickTime
-				end)
 			end
 		end
 	end
@@ -4301,12 +4273,12 @@ function spreadOutGear(loadoutChildren)
 	end
 end
 
-function openCloseBackpack(close)
+function openCloseBackpack()
 	if openCloseDebounce then return end
 	openCloseDebounce = true
-
+	
 	local visible = not backpack.Visible
-	if visible and not close then
+	if visible then
 		updateGridActive()
 		local centerDialogSupported, msg = pcall(function() game.GuiService:AddCenterDialog(backpack, Enum.CenterDialogType.PlayerInitiatedDialog, 
 			function()
@@ -4318,9 +4290,6 @@ function openCloseBackpack(close)
 					end
 				end 
 				spreadOutGear(loadoutChildren)
-			end,
-			function()
-				backpack.Visible = false
 			end)
 		end)
 		backpackButton.Selected = true
@@ -4369,7 +4338,7 @@ function loadoutCheck(child, selectState)
 	if not child:IsA("ImageButton") then return end
 	for k,v in pairs(backpackItems) do
 		if buttons[v] then
-			if child:FindFirstChild("GearReference") and buttons[v]:FindFirstChild("GearReference") then
+			if child:FindFirstChild("GearReference") then
 				if buttons[v].GearReference.Value == child.GearReference.Value then
 					buttons[v].Active = selectState
 					break
@@ -4449,13 +4418,6 @@ end
 function activateBackpack()
 	backpack.Visible = backpackOldStateVisible
 	
-	loadoutChildren = currentLoadout:GetChildren()
-	for i = 1, #loadoutChildren do
-		if loadoutChildren[i]:IsA("Frame") then
-			loadoutChildren[i].BackgroundTransparency = 1
-		end
-	end
-
 	backpackButtonClickCon = backpackButton.MouseButton1Click:connect(function() openCloseBackpack() end)
 	guiServiceKeyPressCon = game:GetService("GuiService").KeyPressed:connect(function(key)
 		if key == tilde or key == backquote then
@@ -4469,7 +4431,6 @@ function deactivateBackpack()
 
 	backpackOldStateVisible = backpack.Visible
 	backpack.Visible = false
-	openCloseBackpack(true)
 end
 
 function setupCharacterConnections()
@@ -4504,9 +4465,6 @@ function setupCharacterConnections()
 	humanoidDiedCon = game.Players.LocalPlayer.Character.Humanoid.Died:connect(function() deactivateBackpack() end)
 	
 	activateBackpack()
-
-	wait()
-	centerGear(currentLoadout:GetChildren())
 end
 
 function removeCharacterConnections()
@@ -4594,7 +4552,7 @@ function getGearContextMenu()
 	gearContextMenuButton.Name = "UnequipContextMenuButton"
 	gearContextMenuButton.Text = ""
 	gearContextMenuButton.Style = Enum.ButtonStyle.RobloxButtonDefault
-	gearContextMenuButton.ZIndex = 8
+	gearContextMenuButton.ZIndex = 4
 	gearContextMenuButton.Size = UDim2.new(1, 0, 1, -20)
 	gearContextMenuButton.Visible = true
 	gearContextMenuButton.Parent = gearContextMenu
@@ -4627,7 +4585,7 @@ function getGearContextMenu()
 			button.Size = UDim2.new(1, 8, 0, elementHeight)
 			button.Position = UDim2.new(0,0,0,elementHeight * i)
 			button.TextColor3 = Color3.new(1,1,1)
-			button.ZIndex = 9
+			button.ZIndex = 4
 			button.Parent = gearContextMenuButton
 
 			button.MouseButton1Click:connect(function()
@@ -4670,7 +4628,7 @@ function getGearContextMenu()
 			label.Position = UDim2.new(0.0, 0, 0, 0)
 			label.Size = UDim2.new(0.5, 0, 1, 0)
 			label.TextColor3 = Color3.new(1,1,1)
-			label.ZIndex = 9
+			label.ZIndex = 4
 			label.Parent = frame
 			element.Label1 = label
 		
@@ -4686,7 +4644,7 @@ function getGearContextMenu()
 				label.Position = UDim2.new(0.5, 0, 0, 0)
 				label.Size = UDim2.new(0.5, 0, 1, 0)
 				label.TextColor3 = Color3.new(1,1,1)
-				label.ZIndex = 9
+				label.ZIndex = 4
 				label.Parent = frame
 				element.Label2 = label
 			end
@@ -4780,7 +4738,6 @@ for i = 1, #loadoutChildren do
 	end
 end
 
-pcall(function() closeButton.Modal = true end)
 closeButton.MouseButton1Click:connect(function() openCloseBackpack() end)
 
 searchButton.MouseButton1Click:connect(function() showSearchGear() end)

scripts/launcher/info.ini

@@ -10,4 +10,4 @@ ExtendedVersionEditChangelog=True
 ExtendedVersionTemplate=%version% Snapshot v22.%build%.%revision%.%extended-revision%
 ExtendedVersionRevision=1
 IsLite=False
-InitialBootup=True
+InitialBootup=False