diff --git a/CSMPFunctions.lua b/CSMPFunctions.lua index 15aa976..e982c24 100644 --- a/CSMPFunctions.lua +++ b/CSMPFunctions.lua @@ -209,6 +209,8 @@ function CSServer(Port) game:GetService("RunService"):Run(); if (rbxlegacyversion == "delta-gamma") then game.Workspace:InsertContent("rbxasset://Fonts//Health2010.rbxm"); + elseif (rbxlegacyversion == "delta") then + game.Workspace:InsertContent("rbxasset://Fonts//Health2011.rbxm"); end pcall(function() game.Close:connect(function() NetworkServer:Stop(); end) end); NetworkServer.IncommingConnection:connect(IncommingConnection); @@ -447,6 +449,8 @@ function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID, game:GetService("RunService"):run(); if (rbxlegacyversion == "gamma" or rbxlegacyversion == "delta-gamma") then game.Workspace:InsertContent("rbxasset://Fonts//Health2010.rbxm"); + elseif (rbxlegacyversion == "delta") then + game.Workspace:InsertContent("rbxasset://Fonts//Health2011.rbxm"); end plr.Name = PlayerName; plr:LoadCharacter(); diff --git a/cut/Health2010.rbxm b/Health2010.rbxm similarity index 55% rename from cut/Health2010.rbxm rename to Health2010.rbxm index 7e3e817..cb430cc 100644 --- a/cut/Health2010.rbxm +++ b/Health2010.rbxm @@ -10,7 +10,7 @@ script:remove(); true - + HealthGUI true @@ -18,22 +18,22 @@ script:remove(); false - 4294901760 - 0 + 4285215356 + 1 4279970357 - 0 - Background + 1 + Tray - 1 - -50 - 0.5 - -75 + 0.949999988 + 0 + 0.380000025 + 0 - 0 - 8 - 0 - 150 + 0.0450000018 + 0 + 0.340000004 + 0 0 true @@ -43,26 +43,26 @@ script:remove(); false - 4278255360 + 4286892054 0 - 4279970357 + 4278190080 0 HealthBar - 0 + 0.420000017 0 0 0 - 0 - 8 - 0 - 150 + 0.159999996 + 0 + 0.800000012 + 0 0 true - 1 + 2 true @@ -73,86 +73,62 @@ script:remove(); h = script.Parent.Parent.Parent.Parent.Parent.Character.Humanoid h.Changed:connect(function() - script.Parent.Size = UDim2.new(0,8,0,(h.Health*1.5)) - script.Parent.Position = UDim2.new(0,0,0,((100-h.Health)*1.5)) + script.Parent.Size = UDim2.new(0.2, 0, 0.8 * (h.Health / h.MaxHealth), 0) + script.Parent.Position = UDim2.new(0.4, 0, 0.8 * (1- (h.Health / h.MaxHealth)) , 0) end) - - true - - - - - false - - Resize - local tray = script.Parent.tray -local screen = script.Parent - -function makeYRelative() - tray.SizeConstraint = 2 -end - -function makeXRelative() - tray.SizeConstraint = 1 -end - - -if screen.AbsoluteSize.x > screen.AbsoluteSize.y then - makeYRelative() - else - makeXRelative() -end - -function recenter() - tray.Position = UDim2.new(0,screen.AbsoluteSize.X/2 - tray.AbsoluteSize.X/2,tray.Position.Y.Scale,tray.Position.Y.Offset) -end - -recenter() -screen.Changed:connect(function(property) - - if property == "AbsoluteSize" then - if screen.AbsoluteSize.x > screen.AbsoluteSize.y then - makeYRelative() - else - makeXRelative() - end - recenter() - end - -end) - true - + false - 4279069106 + 4289733411 0 - 4279970357 - 1 - Label + 4278190080 + 0 + HealthBarBacking - 0 - 3 - 1 - 10 - - - 0 + 0.419999987 0 0 0 + + 0.159999996 + 0 + 0.800000012 + 0 + 0 - Health - 4278190335 - 0 - false - 2 - 1 + true + 1 + true + + + + + false + 4294967295 + 1 + 4279970357 + 1 + rbxasset://textures/health.png + ImageLabel + + 0 + 0 + 0.800000012 + 3 + + + 1 + 0 + 0.25 + 0 + + 1 true 1 true diff --git a/Health2011.rbxm b/Health2011.rbxm new file mode 100644 index 0000000..d453181 --- /dev/null +++ b/Health2011.rbxm @@ -0,0 +1,338 @@ + + null + nil + + + false + + GUI_Copy + script.HealthGUI:clone().Parent = game.StarterGui; +script:remove(); + true + + + + HealthGUI + true + + + + false + 4290164919 + 1 + 4279970357 + 1 + rbxasset://textures/healthgui/HurtOverlay.png + hurtOverlay + + 2 + 0 + 0 + -22 + + + 1 + 0 + 1.1500001 + 30 + + 0 + true + 1 + true + + + + + false + 4285215356 + 1 + 4279970357 + 1 + tray + + 0.5 + -44 + 1 + -26 + + + 0 + 170 + 0 + 18 + + 2 + 0 + true + 1 + true + + + + false + 4294967295 + 1 + 4279970357 + 1 + rbxasset://textures/healthgui/bkg.png + bkg + + 0 + 0 + 0 + 0 + + + 1 + 0 + 1 + 0 + + 0 + true + 1 + true + + + + + false + 4294967295 + 1 + 4279970357 + 1 + rbxasset://textures/healthgui/BarRed.png + barRed + + 0.0189999994 + 0 + 0.100000001 + 0 + + + 0 + 0 + 0 + 0 + + 0 + true + 1 + true + + + + + false + 4294967295 + 1.00000012 + 4279970357 + 0 + bar2 + + 0.0189999994 + 0 + 0.100000001 + 0 + + + 0.192000002 + 0 + 0.829999983 + 0 + + 0 + 0 + true + 1 + true + + + + false + + Script + h = script.Parent.Parent.Parent.Parent.Parent.Character.Humanoid +tray = script.Parent +local lastHealth = 100 +local lastHealth2 = 100 +local maxWidth = 0.96 + +function UpdateGUI(health) + local width = (health / h.MaxHealth) * maxWidth + local height = 0.83 + local lastX = tray.bar.Position.X.Scale + local x = 0.019 + (maxWidth - width) + local y = 0.1 + + tray.bar.Position = UDim2.new(x,0,y, 0) + tray.bar.Size = UDim2.new(width, 0, height, 0) + -- If more than 1/4 health, bar = green. Else, bar = red. + if( (health / h.MaxHealth) > 0.25 ) then + tray.barRed.Size = UDim2.new(0, 0, 0, 0) + else + tray.barRed.Position = tray.bar.Position + tray.barRed.Size = tray.bar.Size + tray.bar.Size = UDim2.new(0, 0, 0, 0) + end + + if ( (lastHealth - health) > (h.MaxHealth / 10) ) then + lastHealth = health + + if h.Health ~= h.MaxHealth then + delay(0,function() + AnimateHurtOverlay() + end) + delay(0,function() + AnimateBars(x, y, lastX, height) + end) + end + else + lastHealth = health + end +end + + +function HealthChanged(health) + +end + +function AnimateBars(x, y, lastX, height) + local width = math.abs(x - lastX) + if( x > lastX ) then + x = lastX + end + tray.bar2.Position = UDim2.new(x,0, y, 0) + tray.bar2.Size = UDim2.new(width, 0, height, 0) + tray.bar2.BackgroundTransparency = 0 + local GBchannels = 1 + local j = 0.2 + + local i_total = 30 + for i=1,i_total do + -- Increment Values + if (GBchannels < 0.2) then + j = -j + end + GBchannels = GBchannels + j + if (i > (i_total - 10)) then + tray.bar2.BackgroundTransparency = tray.bar2.BackgroundTransparency + 0.1 + end + tray.bar2.BackgroundColor3 = Color3.new(1, GBchannels, GBchannels) + + wait(0.02) + end +end + +function AnimateHurtOverlay() + -- Start: + -- overlay.Position = UDim2.new(0, 0, 0, -22) + -- overlay.Size = UDim2.new(1, 0, 1.15, 30) + + -- Finish: + -- overlay.Position = UDim2.new(-2, 0, -2, -22) + -- overlay.Size = UDim2.new(4.5, 0, 4.65, 30) + + overlay = HealthGUI_prototype.hurtOverlay + overlay.Position = UDim2.new(-2, 0, -2, -22) + overlay.Size = UDim2.new(4.5, 0, 4.65, 30) + -- Animate In, fast + local i_total = 2 + local wiggle_total = 0 + local wiggle_i = 0.02 + for i=1,i_total do + overlay.Position = UDim2.new( (-2 + (2 * (i/i_total)) + wiggle_total/2), 0, (-2 + (2 * (i/i_total)) + wiggle_total/2), -22 ) + overlay.Size = UDim2.new( (4.5 - (3.5 * (i/i_total)) + wiggle_total), 0, (4.65 - (3.5 * (i/i_total)) + wiggle_total), 30 ) + wait(0.01) + end + + i_total = 30 + + wait(0.03) + + -- Animate Out, slow + for i=1,i_total do + if( math.abs(wiggle_total) > (wiggle_i * 3) ) then + wiggle_i = -wiggle_i + end + wiggle_total = wiggle_total + wiggle_i + overlay.Position = UDim2.new( (0 - (2 * (i/i_total)) + wiggle_total/2), 0, (0 - (2 * (i/i_total)) + wiggle_total/2), -22 ) + overlay.Size = UDim2.new( (1 + (3.5 * (i/i_total)) + wiggle_total), 0, (1.15 + (3.5 * (i/i_total)) + wiggle_total), 30 ) + wait(0.01) + end + + -- Hide after we're done + overlay.Position = UDim2.new(10, 0, 0, 0) +end + +h.Changed:connect(function() + UpdateGUI(health) + if ( (lastHealth2 - health) > (humanoid.MaxHealth / 10) ) then + lastHealth2 = health + else + lastHealth2 = health + end end) + + true + + + + + + false + 4294967295 + 1 + 4279970357 + 1 + rbxasset://textures/healthgui/Bar.png + bar + + 0.0189999994 + 0 + 0.100000001 + 0 + + + 0.959999979 + 0 + 0.829999983 + 0 + + 0 + true + 1 + true + + + + + false + 4294967295 + 1 + 4279970357 + 0 + rbxasset://textures/healthgui/label.png + label + + 0.680000007 + 0 + 0.300000012 + 0 + + + 0.25 + 0 + 0.349999994 + 0 + + 0 + true + 1 + true + + + + + + \ No newline at end of file diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs index c60d36c..2035471 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs @@ -746,6 +746,7 @@ namespace RBXLegacyLauncher this.richTextBox1.TabIndex = 2; this.richTextBox1.Text = ""; this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); + this.richTextBox1.AllowDrop = false; // // tabPage8 // diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs index 62cd53a..becf2cd 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs @@ -878,6 +878,10 @@ namespace RBXLegacyLauncher { StartServerNo3D(); } + else if (command.Equals("rbxlegacy no3d")) + { + StartServerNo3D(); + } else if (command.Equals("rbxlegacy client")) { StartClient(); @@ -886,6 +890,10 @@ namespace RBXLegacyLauncher { StartSolo(); } + else if (command.Equals("rbxlegacy solo")) + { + StartSolo(); + } else if (command.Equals("rbxlegacy studio")) { StartStudio(); @@ -904,15 +912,23 @@ namespace RBXLegacyLauncher } else if (command.Equals("rbxlegacy help")) { - ConsoleRBXLegacyHelp(false); + ConsoleRBXLegacyHelp(0); } else if (command.Equals("rbxlegacy")) { - ConsoleRBXLegacyHelp(false); + ConsoleRBXLegacyHelp(0); } else if (command.Equals("rbxlegacy config")) { - ConsoleRBXLegacyHelp(true); + ConsoleRBXLegacyHelp(1); + } + else if (command.Equals("config")) + { + ConsoleRBXLegacyHelp(1); + } + else if (command.Equals("help")) + { + ConsoleRBXLegacyHelp(0); } else { @@ -921,29 +937,29 @@ namespace RBXLegacyLauncher } - void ConsoleRBXLegacyHelp(bool config) + void ConsoleRBXLegacyHelp(int page) { - if (config == true) + if (page == 1) { - ConsolePrint("rbxlegacy config", 1); + ConsolePrint("rbxlegacy config", 2); ConsolePrint("-------------------------", 1); - ConsolePrint("= save | Saves the config file", 1); - ConsolePrint("= load | Reloads the config file", 1); - ConsolePrint("= reset | Resets the config file", 1, false); + ConsolePrint("= save | Saves the config file", 3); + ConsolePrint("= load | Reloads the config file", 3); + ConsolePrint("= reset | Resets the config file", 3, false); } else { - ConsolePrint("rbxlegacy", 1); + ConsolePrint("rbxlegacy", 2); ConsolePrint("---------", 1); - ConsolePrint("= client | Loads client with launcher settings", 1); - ConsolePrint("-- solo | Loads client in Play Solo mode with launcher settings", 1); - ConsolePrint("= server | Loads server with launcher settings", 1); - ConsolePrint("-- no3d | Loads server in NoGraphics mode with launcher settings", 1); - ConsolePrint("= studio | Loads Roblox Studio with launcher settings", 1); - ConsolePrint("= config", 1); - ConsolePrint("-- save | Saves the config file", 1); - ConsolePrint("-- load | Reloads the config file", 1); - ConsolePrint("-- reset | Resets the config file", 1, false); + ConsolePrint("= client | Loads client with launcher settings", 3); + ConsolePrint("-- solo | Loads client in Play Solo mode with launcher settings", 4); + ConsolePrint("= server | Loads server with launcher settings", 3); + ConsolePrint("-- no3d | Loads server in NoGraphics mode with launcher settings", 4); + ConsolePrint("= studio | Loads Roblox Studio with launcher settings", 3); + ConsolePrint("= config", 3); + ConsolePrint("-- save | Saves the config file", 4); + ConsolePrint("-- load | Reloads the config file", 4); + ConsolePrint("-- reset | Resets the config file", 4, false); } } } diff --git a/cut/3.1.rbxm b/cut/3.1.rbxm deleted file mode 100644 index f17cd42..0000000 --- a/cut/3.1.rbxm +++ /dev/null @@ -1,146 +0,0 @@ - - null - nil - - - false - - HealthScript v3.1 - local HealthGUI_prototype = script:FindFirstChild("HealthGUI") -local lastHealth = 100 -local lastHealth2 = 100 -local maxWidth = 0.96 - -local humanoid = script.Parent.Humanoid - -if (humanoid == nil) then - print("ERROR: no humanoid found in 'HealthScript v3.1'") -end - - -function CreateGUI() - local p = game.Players:GetPlayerFromCharacter(humanoid.Parent) - HealthGUI_prototype.Parent = p.PlayerGui -end - -function UpdateGUI(health) - tray = HealthGUI_prototype.tray - local width = (health / humanoid.MaxHealth) * maxWidth - local height = 0.83 - local lastX = tray.bar.Position.X.Scale - local x = 0.019 + (maxWidth - width) - local y = 0.1 - - tray.bar.Position = UDim2.new(x,0,y, 0) - tray.bar.Size = UDim2.new(width, 0, height, 0) - -- If more than 1/4 health, bar = green. Else, bar = red. - if( (health / humanoid.MaxHealth) > 0.25 ) then - tray.barRed.Size = UDim2.new(0, 0, 0, 0) - else - tray.barRed.Position = tray.bar.Position - tray.barRed.Size = tray.bar.Size - tray.bar.Size = UDim2.new(0, 0, 0, 0) - end - - if ( (lastHealth - health) > (humanoid.MaxHealth / 10) ) then - lastHealth = health - - if humanoid.Health ~= humanoid.MaxHealth then - delay(0,function() - AnimateHurtOverlay() - end) - delay(0,function() - AnimateBars(x, y, lastX, height) - end) - end - else - lastHealth = health - end -end - - -function HealthChanged(health) - UpdateGUI(health) - if ( (lastHealth2 - health) > (humanoid.MaxHealth / 10) ) then - lastHealth2 = health - else - lastHealth2 = health - end -end - -function AnimateBars(x, y, lastX, height) - tray = HealthGUI_prototype.tray - local width = math.abs(x - lastX) - if( x > lastX ) then - x = lastX - end - tray.bar2.Position = UDim2.new(x,0, y, 0) - tray.bar2.Size = UDim2.new(width, 0, height, 0) - tray.bar2.BackgroundTransparency = 0 - local GBchannels = 1 - local j = 0.2 - - local i_total = 30 - for i=1,i_total do - -- Increment Values - if (GBchannels < 0.2) then - j = -j - end - GBchannels = GBchannels + j - if (i > (i_total - 10)) then - tray.bar2.BackgroundTransparency = tray.bar2.BackgroundTransparency + 0.1 - end - tray.bar2.BackgroundColor3 = Color3.new(1, GBchannels, GBchannels) - - wait(0.02) - end -end - -function AnimateHurtOverlay() - -- Start: - -- overlay.Position = UDim2.new(0, 0, 0, -22) - -- overlay.Size = UDim2.new(1, 0, 1.15, 30) - - -- Finish: - -- overlay.Position = UDim2.new(-2, 0, -2, -22) - -- overlay.Size = UDim2.new(4.5, 0, 4.65, 30) - - overlay = HealthGUI_prototype.hurtOverlay - overlay.Position = UDim2.new(-2, 0, -2, -22) - overlay.Size = UDim2.new(4.5, 0, 4.65, 30) - -- Animate In, fast - local i_total = 2 - local wiggle_total = 0 - local wiggle_i = 0.02 - for i=1,i_total do - overlay.Position = UDim2.new( (-2 + (2 * (i/i_total)) + wiggle_total/2), 0, (-2 + (2 * (i/i_total)) + wiggle_total/2), -22 ) - overlay.Size = UDim2.new( (4.5 - (3.5 * (i/i_total)) + wiggle_total), 0, (4.65 - (3.5 * (i/i_total)) + wiggle_total), 30 ) - wait(0.01) - end - - i_total = 30 - - wait(0.03) - - -- Animate Out, slow - for i=1,i_total do - if( math.abs(wiggle_total) > (wiggle_i * 3) ) then - wiggle_i = -wiggle_i - end - wiggle_total = wiggle_total + wiggle_i - overlay.Position = UDim2.new( (0 - (2 * (i/i_total)) + wiggle_total/2), 0, (0 - (2 * (i/i_total)) + wiggle_total/2), -22 ) - overlay.Size = UDim2.new( (1 + (3.5 * (i/i_total)) + wiggle_total), 0, (1.15 + (3.5 * (i/i_total)) + wiggle_total), 30 ) - wait(0.01) - end - - -- Hide after we're done - overlay.Position = UDim2.new(10, 0, 0, 0) -end - -CreateGUI() -humanoid.HealthChanged:connect(HealthChanged) -humanoid.Died:connect(function() HealthChanged(0) end) - true - - - \ No newline at end of file diff --git a/cut/Health2011.rbxm b/cut/Health2011.rbxm deleted file mode 100644 index 9ad9763..0000000 --- a/cut/Health2011.rbxm +++ /dev/null @@ -1,388 +0,0 @@ - - null - nil - - - false - 4294967295 - 1 - 4279970357 - 1 - http://www.roblox.com/asset/?id=35238036 - barRed - - 0.0189999994 - 0 - 0.100000001 - 0 - - - 0 - 0 - 0 - 0 - - 0 - true - 1 - true - - - - - false - 4285215356 - 1 - 4279970357 - 1 - tray - - 0.5 - -44 - 1 - -26 - - - 0 - 170 - 0 - 18 - - 2 - 0 - true - 1 - true - - - - false - 4294967295 - 1 - 4279970357 - 1 - http://www.roblox.com/asset/?id=35238000 - bkg - - 0 - 0 - 0 - 0 - - - 1 - 0 - 1 - 0 - - 0 - true - 1 - true - - - - - false - 4294967295 - 1 - 4279970357 - 1 - http://www.roblox.com/asset/?id=35238036 - barRed - - 0.0189999994 - 0 - 0.100000001 - 0 - - - 0 - 0 - 0 - 0 - - 0 - true - 1 - true - - - - - false - 4294967295 - 1.00000012 - 4279970357 - 0 - bar2 - - 0.0189999994 - 0 - 0.100000001 - 0 - - - 0.192000002 - 0 - 0.829999983 - 0 - - 0 - 0 - true - 1 - true - - - - - false - 4294967295 - 1 - 4279970357 - 1 - http://www.roblox.com/asset/?id=35238053 - bar - - 0.0189999994 - 0 - 0.100000001 - 0 - - - 0.959999979 - 0 - 0.829999983 - 0 - - 0 - true - 1 - true - - - - - false - 4294967295 - 1 - 4279970357 - 0 - http://www.roblox.com/asset/?id=34816363 - label - - 0.680000007 - 0 - 0.300000012 - 0 - - - 0.25 - 0 - 0.349999994 - 0 - - 0 - true - 1 - true - - - - - - HealthGUI - true - - - - false - 4290164919 - 1 - 4279970357 - 1 - http://www.roblox.com/asset/?id=34854607 - hurtOverlay - - 2 - 0 - 0 - -22 - - - 1 - 0 - 1.1500001 - 30 - - 0 - true - 1 - true - - - - - false - 4285215356 - 1 - 4279970357 - 1 - tray - - 0.5 - -44 - 1 - -26 - - - 0 - 170 - 0 - 18 - - 2 - 0 - true - 1 - true - - - - false - 4294967295 - 1 - 4279970357 - 1 - http://www.roblox.com/asset/?id=35238000 - bkg - - 0 - 0 - 0 - 0 - - - 1 - 0 - 1 - 0 - - 0 - true - 1 - true - - - - - false - 4294967295 - 1 - 4279970357 - 1 - http://www.roblox.com/asset/?id=35238036 - barRed - - 0.0189999994 - 0 - 0.100000001 - 0 - - - 0 - 0 - 0 - 0 - - 0 - true - 1 - true - - - - - false - 4294967295 - 1.00000012 - 4279970357 - 0 - bar2 - - 0.0189999994 - 0 - 0.100000001 - 0 - - - 0.192000002 - 0 - 0.829999983 - 0 - - 0 - 0 - true - 1 - true - - - - - false - 4294967295 - 1 - 4279970357 - 1 - http://www.roblox.com/asset/?id=35238053 - bar - - 0.0189999994 - 0 - 0.100000001 - 0 - - - 0.959999979 - 0 - 0.829999983 - 0 - - 0 - true - 1 - true - - - - - false - 4294967295 - 1 - 4279970357 - 0 - http://www.roblox.com/asset/?id=34816363 - label - - 0.680000007 - 0 - 0.300000012 - 0 - - - 0.25 - 0 - 0.349999994 - 0 - - 0 - true - 1 - true - - - - - \ No newline at end of file diff --git a/cut/healthgui/Bar.png b/healthgui/Bar.png similarity index 100% rename from cut/healthgui/Bar.png rename to healthgui/Bar.png diff --git a/cut/healthgui/BarRed.png b/healthgui/BarRed.png similarity index 100% rename from cut/healthgui/BarRed.png rename to healthgui/BarRed.png diff --git a/cut/healthgui/HurtOverlay.png b/healthgui/HurtOverlay.png similarity index 100% rename from cut/healthgui/HurtOverlay.png rename to healthgui/HurtOverlay.png diff --git a/cut/healthgui/bkg.png b/healthgui/bkg.png similarity index 100% rename from cut/healthgui/bkg.png rename to healthgui/bkg.png diff --git a/cut/healthgui/label.png b/healthgui/label.png similarity index 100% rename from cut/healthgui/label.png rename to healthgui/label.png