diff --git a/BodyColorGen/BodyColorGen/Program.cs b/BodyColorGen/BodyColorGen/Program.cs index ad3809c..770a4e0 100644 --- a/BodyColorGen/BodyColorGen/Program.cs +++ b/BodyColorGen/BodyColorGen/Program.cs @@ -14,25 +14,72 @@ namespace BodyColorGen { class Program { - public static void Main(string[] args) + public static int Main(string[] args) { Console.Title = "RBXLegacy - Body Color Generator"; + // Test if input arguments were supplied: + if (args.Length == 0) + { + Console.WriteLine("Usage: BodyColorGen "); + Console.WriteLine("Number Values:"); + Console.WriteLine("0 = All possible combos"); + Console.WriteLine("1 = 2006 style patterns"); + Console.WriteLine("2 = Shirt and Pants"); + return 1; + } + + int num; + bool test = int.TryParse(args[0], out num); + if (test == false) + { + Console.WriteLine("Usage: BodyColorGen "); + Console.WriteLine("Number Values:"); + Console.WriteLine("0 = All possible combos"); + Console.WriteLine("1 = 2006 style patterns"); + Console.WriteLine("2 = Shirt and Pants"); + return 1; + } + int[] colorArray = new int[32] {1,208,194,199,26,21,24,226,23,107,102,11,45,135,106,105,141,28,37,119,29,151,38,192,104,9,101,5,153,217,18,125}; int HeadColor,TorsoColor,LArmColor,RArmColor,LLegColor,RLegColor; int FleshColor,ShirtColor,PantsColor; while (true) { Random rand = new Random(); - FleshColor = rand.Next(colorArray.Length); - ShirtColor = rand.Next(colorArray.Length); - PantsColor = rand.Next(colorArray.Length); - HeadColor = colorArray[FleshColor]; - TorsoColor = colorArray[ShirtColor]; - LArmColor = colorArray[FleshColor]; - RArmColor = colorArray[FleshColor]; - LLegColor = colorArray[PantsColor]; - RLegColor = colorArray[PantsColor]; + if (num == 1) + { + FleshColor = rand.Next(colorArray.Length); + ShirtColor = rand.Next(colorArray.Length); + PantsColor = rand.Next(colorArray.Length); + HeadColor = colorArray[FleshColor]; + TorsoColor = colorArray[ShirtColor]; + LArmColor = colorArray[FleshColor]; + RArmColor = colorArray[FleshColor]; + LLegColor = colorArray[PantsColor]; + RLegColor = colorArray[PantsColor]; + } + else if (num == 2) + { + FleshColor = rand.Next(colorArray.Length); + ShirtColor = rand.Next(colorArray.Length); + PantsColor = rand.Next(colorArray.Length); + HeadColor = colorArray[FleshColor]; + TorsoColor = colorArray[ShirtColor]; + LArmColor = colorArray[ShirtColor]; + RArmColor = colorArray[ShirtColor]; + LLegColor = colorArray[PantsColor]; + RLegColor = colorArray[PantsColor]; + } + else + { + HeadColor = colorArray[rand.Next(colorArray.Length)]; + TorsoColor = colorArray[rand.Next(colorArray.Length)]; + LArmColor = colorArray[rand.Next(colorArray.Length)]; + RArmColor = colorArray[rand.Next(colorArray.Length)]; + LLegColor = colorArray[rand.Next(colorArray.Length)]; + RLegColor = colorArray[rand.Next(colorArray.Length)]; + } string dirname = "bodycolors/"; if(!Directory.Exists(dirname)) { diff --git a/BodyColorGen/BodyColorGen/Program_old.cs b/BodyColorGen/BodyColorGen/Program_old.cs deleted file mode 100644 index bae9440..0000000 --- a/BodyColorGen/BodyColorGen/Program_old.cs +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Created by SharpDevelop. - * User: BITL - * Date: 5/24/2017 - * Time: 7:01 PM - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using System.Xml; -using System.IO; - -namespace BodyColorGen -{ - class Program - { - public static void Main(string[] args) - { - Console.Title = "RBXLegacy - Body Color Generator"; - - int[] colorArray = new int[32] {1,208,194,199,26,21,24,226,23,107,102,11,45,135,106,105,141,28,37,119,29,151,38,192,104,9,101,5,153,217,18,125}; - int HeadColor,TorsoColor,LArmColor,RArmColor,LLegColor,RLegColor; - while (true) - { - Random rand = new Random(); - HeadColor = colorArray[rand.Next(colorArray.Length)]; - TorsoColor = colorArray[rand.Next(colorArray.Length)]; - LArmColor = colorArray[rand.Next(colorArray.Length)]; - RArmColor = colorArray[rand.Next(colorArray.Length)]; - LLegColor = colorArray[rand.Next(colorArray.Length)]; - RLegColor = colorArray[rand.Next(colorArray.Length)]; - string dirname = "bodycolors/"; - if(!Directory.Exists(dirname)) - { - System.IO.Directory.CreateDirectory(dirname); - } - string filename = dirname + HeadColor + "-" + TorsoColor + "-" + LArmColor + "-" + RArmColor + "-" + LLegColor + "-" + RLegColor +".rbxm"; - if (!File.Exists(filename)) - { - Console.ForegroundColor = ConsoleColor.Green; - Console.WriteLine("Writing " + filename); - XmlTextWriter writer = new XmlTextWriter(filename, System.Text.Encoding.UTF8); - writer.Formatting = Formatting.Indented; - writer.Indentation = 3; - writer.WriteStartDocument(true); - writer.WriteStartElement("roblox"); - writer.WriteAttributeString("xmlns:xmime", "http://www.w3.org/2005/05/xmlmime"); - writer.WriteAttributeString("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance"); - writer.WriteAttributeString("xsi:noNamespaceSchemaLocation", "http://www.roblox.com/roblox.xsd"); - writer.WriteAttributeString("version", "4"); - writer.WriteStartElement("External"); - writer.WriteString("null"); - writer.WriteEndElement(); - writer.WriteStartElement("External"); - writer.WriteString("nil"); - writer.WriteEndElement(); - writer.WriteStartElement("Item"); - writer.WriteAttributeString("class", "BodyColors"); - writer.WriteStartElement("Properties"); - writer.WriteStartElement("int"); - writer.WriteAttributeString("name", "HeadColor"); - writer.WriteString(HeadColor.ToString()); - writer.WriteEndElement(); - writer.WriteStartElement("int"); - writer.WriteAttributeString("name", "LeftArmColor"); - writer.WriteString(LArmColor.ToString()); - writer.WriteEndElement(); - writer.WriteStartElement("int"); - writer.WriteAttributeString("name", "LeftLegColor"); - writer.WriteString(LLegColor.ToString()); - writer.WriteEndElement(); - writer.WriteStartElement("string"); - writer.WriteAttributeString("name", "Name"); - writer.WriteString("Body Colors"); - writer.WriteEndElement(); - writer.WriteStartElement("int"); - writer.WriteAttributeString("name", "RightArmColor"); - writer.WriteString(RArmColor.ToString()); - writer.WriteEndElement(); - writer.WriteStartElement("int"); - writer.WriteAttributeString("name", "RightLegColor"); - writer.WriteString(RLegColor.ToString()); - writer.WriteEndElement(); - writer.WriteStartElement("int"); - writer.WriteAttributeString("name", "TorsoColor"); - writer.WriteString(TorsoColor.ToString()); - writer.WriteEndElement(); - writer.WriteStartElement("bool"); - writer.WriteAttributeString("name", "archivable"); - writer.WriteString("true"); - writer.WriteEndElement(); - writer.WriteEndElement(); - writer.WriteEndElement(); - writer.WriteEndElement(); - writer.WriteEndDocument(); - writer.Close(); - } - } - } - } -} \ No newline at end of file diff --git a/CSMPFunctions.lua b/CSMPFunctions.lua index a04d092..15aa976 100644 --- a/CSMPFunctions.lua +++ b/CSMPFunctions.lua @@ -1,4 +1,4 @@ ---set this to pre-alpha, alpha, beta, pre-gamma, gamma, delta-gamma or delta. +--set this to pre-alpha, pre-alpha-ext, alpha, beta, pre-gamma, gamma, delta-gamma, delta or omega. rbxlegacyversion = "" if (rbxlegacyversion == "pre-alpha") then --mid-2008 and below. currently for the modified clients. settings().Rendering.frameRateManager = 2; @@ -6,6 +6,12 @@ if (rbxlegacyversion == "pre-alpha") then --mid-2008 and below. currently for th settings().Network.MaxSendBuffer = 1000000; settings().Network.PhysicsReplicationUpdateRate = 1000000; settings().Network.SendRate = 1000000; +elseif (rbxlegacyversion == "pre-alpha-ext") then --mid-2008 and below. currently for the modified clients. use if needing to use extended customization. + settings().Rendering.frameRateManager = 2; + settings().Rendering.graphicsMode = 2; + settings().Network.MaxSendBuffer = 1000000; + settings().Network.PhysicsReplicationUpdateRate = 1000000; + settings().Network.SendRate = 1000000; elseif (rbxlegacyversion == "alpha") then --mid-2008 and below settings().Rendering.frameRateManager = 2; settings().Rendering.graphicsMode = 2; @@ -48,119 +54,135 @@ elseif (rbxlegacyversion == "delta") then -- late 2010-early 2011. coroutine.resume(coroutine.create(function() loadstring('\108\111\99\97\108\32\67\111\114\101\71\117\105\32\61\32\103\97\109\101\58\71\101\116\83\101\114\118\105\99\101\40\34\67\111\114\101\71\117\105\34\41\59\10\119\104\105\108\101\32\110\111\116\32\67\111\114\101\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\82\111\98\108\111\120\71\117\105\34\41\32\100\111\10\9\67\111\114\101\71\117\105\46\67\104\105\108\100\65\100\100\101\100\58\119\97\105\116\40\41\59\10\101\110\100\10\108\111\99\97\108\32\82\111\98\108\111\120\71\117\105\32\61\32\67\111\114\101\71\117\105\46\82\111\98\108\111\120\71\117\105\59\10\108\111\99\97\108\32\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\32\61\32\82\111\98\108\111\120\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\34\41\10\108\111\99\97\108\32\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\32\61\32\82\111\98\108\111\120\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\34\41\10\108\111\99\97\108\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\32\61\32\82\111\98\108\111\120\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\84\111\112\76\101\102\116\67\111\110\116\114\111\108\34\41\10\108\111\99\97\108\32\66\117\105\108\100\84\111\111\108\115\32\61\32\82\111\98\108\111\120\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\66\117\105\108\100\84\111\111\108\115\34\41\10\102\117\110\99\116\105\111\110\32\109\97\107\101\89\82\101\108\97\116\105\118\101\40\41\10\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\50\10\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\50\10\105\102\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\32\116\104\101\110\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\50\32\101\110\100\10\105\102\32\66\117\105\108\100\84\111\111\108\115\32\116\104\101\110\32\66\117\105\108\100\84\111\111\108\115\46\70\114\97\109\101\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\50\32\101\110\100\10\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\80\111\115\105\116\105\111\110\32\61\32\85\68\105\109\50\46\110\101\119\40\48\44\48\44\49\44\45\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\89\41\10\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\80\111\115\105\116\105\111\110\32\61\32\85\68\105\109\50\46\110\101\119\40\49\44\45\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\88\44\49\44\45\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\89\41\10\101\110\100\10\102\117\110\99\116\105\111\110\32\109\97\107\101\88\82\101\108\97\116\105\118\101\40\41\10\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\49\10\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\49\10\105\102\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\32\116\104\101\110\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\49\32\101\110\100\10\105\102\32\66\117\105\108\100\84\111\111\108\115\32\116\104\101\110\32\66\117\105\108\100\84\111\111\108\115\46\70\114\97\109\101\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\49\32\101\110\100\10\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\80\111\115\105\116\105\111\110\32\61\32\85\68\105\109\50\46\110\101\119\40\48\44\48\44\49\44\45\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\89\41\10\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\80\111\115\105\116\105\111\110\32\61\32\85\68\105\109\50\46\110\101\119\40\49\44\45\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\88\44\49\44\45\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\89\41\10\101\110\100\10\108\111\99\97\108\32\102\117\110\99\116\105\111\110\32\114\101\115\105\122\101\40\41\10\105\102\32\82\111\98\108\111\120\71\117\105\46\65\98\115\111\108\117\116\101\83\105\122\101\46\120\32\62\32\82\111\98\108\111\120\71\117\105\46\65\98\115\111\108\117\116\101\83\105\122\101\46\121\32\116\104\101\110\10\109\97\107\101\89\82\101\108\97\116\105\118\101\40\41\10\101\108\115\101\10\109\97\107\101\88\82\101\108\97\116\105\118\101\40\41\10\101\110\100\10\101\110\100\10\82\111\98\108\111\120\71\117\105\46\67\104\97\110\103\101\100\58\99\111\110\110\101\99\116\40\102\117\110\99\116\105\111\110\40\112\114\111\112\101\114\116\121\41\10\105\102\32\112\114\111\112\101\114\116\121\32\61\61\32\34\65\98\115\111\108\117\116\101\83\105\122\101\34\32\116\104\101\110\10\119\97\105\116\40\41\10\114\101\115\105\122\101\40\41\10\101\110\100\10\101\110\100\41\10\119\97\105\116\40\41\10\114\101\115\105\122\101\40\41\10')() end)) +elseif (rbxlegacyversion == "omega") then -- mid 2011 and above, or if you are trying to use RBXPri code. + settings().Rendering.FrameRateManager = 2; end rbxversion = version(); print("ROBLOX Client version '" .. rbxversion .. "' loaded."); -HeadColor=BrickColor.DarkGray(); -TorsoColor=BrickColor.DarkGray(); -LArmColor=BrickColor.DarkGray(); -LLegColor=BrickColor.DarkGray(); -RArmColor=BrickColor.DarkGray(); -RLegColor=BrickColor.DarkGray(); ---localized hats. -Hat1 = "NoHat.rbxm"; -Hat2 = "NoHat.rbxm"; -Hat3 = "NoHat.rbxm"; +--function made by rbxbanland +function newWaitForChild(newParent,name) + local returnable = nil + if newParent:FindFirstChild(name) then + returnable = newParent:FindFirstChild(name) + else + repeat wait() returnable = newParent:FindFirstChild(name) until returnable ~= nil + end + return returnable +end -function PlayerColorize() - if (rbxlegacyversion == "pre-alpha") then - local pantsColor=BrickColor.random(); - local shirtColor=BrickColor.random(); - local fleshColor=BrickColor.random(); - HeadColor=fleshColor; - TorsoColor=shirtColor; - LArmColor=fleshColor; - LLegColor=pantsColor; - RArmColor=fleshColor; - RLegColor=pantsColor; - else - PlayerColorPattern = math.random(5); - if (PlayerColorPattern==1) then - HeadColor=BrickColor.random(); - TorsoColor=BrickColor.random(); - LArmColor=BrickColor.random(); - LLegColor=BrickColor.random(); - RArmColor=BrickColor.random(); - RLegColor=BrickColor.random(); - elseif (PlayerColorPattern==2) then - local pantsColor=BrickColor.random(); - local shirtColor=BrickColor.random(); - local armsColor=BrickColor.random(); - HeadColor=BrickColor.random(); - TorsoColor=shirtColor; - LArmColor=armsColor; - LLegColor=pantsColor; - RArmColor=armsColor; - RLegColor=pantsColor; - elseif (PlayerColorPattern==3) then - local pantsColor=BrickColor.random(); - local shirtColor=BrickColor.random(); - HeadColor=BrickColor.random(); - TorsoColor=shirtColor; - LArmColor=shirtColor; - LLegColor=pantsColor; - RArmColor=shirtColor; - RLegColor=pantsColor; - elseif (PlayerColorPattern==4) then - local pantsColor=BrickColor.random(); - local shirtColor=BrickColor.random(); - local fleshColor=BrickColor.random(); - HeadColor=fleshColor; - TorsoColor=shirtColor; - LArmColor=fleshColor; - LLegColor=pantsColor; - RArmColor=fleshColor; - RLegColor=pantsColor; - elseif (PlayerColorPattern==5) then - HeadColor=BrickColor.random(); - TorsoColor=BrickColor.random(); - LArmColor=BrickColor.Black(); - LLegColor=BrickColor.Black(); - RArmColor=BrickColor.Black(); - RLegColor=BrickColor.Black(); +--we aren't doing anything with shirts or t-shirts or pants yet, we're only doing hats. +function LoadCharacterNew(playerApp,newChar) + local charparts = {[1] = newWaitForChild(newChar,"Head"),[2] = newWaitForChild(newChar,"Torso"),[3] = newWaitForChild(newChar,"Left Arm"),[4] = newWaitForChild(newChar,"Right Arm"),[5] = newWaitForChild(newChar,"Left Leg"),[6] = newWaitForChild(newChar,"Right Leg")} + for _,newVal in pairs(playerApp:GetChildren()) do + if (newVal.CustomizationType.Value == 1) then + pcall(function() + charparts[newVal.ColorIndex.Value].BrickColor = newVal.Value + end) + elseif (newVal.CustomizationType.Value == 2) then + if (rbxlegacyversion ~= "pre-alpha") then + pcall(function() + local newHat = game.Workspace:InsertContent("rbxasset://../../../charcustom/hats/"..newVal.Value) + if newHat[1] then + if newHat[1].className == "Hat" then + newHat[1].Parent = newChar + else + newHat[1]:remove() + end + end + end) + end end end end -function PlayerNoobify() - if (rbxlegacyversion == "pre-alpha") then - HeadColor=BrickColor.new("Cool yellow"); - TorsoColor=BrickColor.random(); - LArmColor=BrickColor.new("Cool yellow"); - LLegColor=BrickColor.new("Pastel Blue"); - RArmColor=BrickColor.new("Cool yellow"); - RLegColor=BrickColor.new("Pastel Blue"); - else - PlayerColorPattern = math.random(3); - if (PlayerColorPattern==1) then - HeadColor=BrickColor.Yellow(); - TorsoColor=BrickColor.Blue(); - LArmColor=BrickColor.Yellow(); - LLegColor=BrickColor.new("Br. yellowish green"); - RArmColor=BrickColor.Yellow(); - RLegColor=BrickColor.new("Br. yellowish green"); - elseif (PlayerColorPattern==2) then - HeadColor=BrickColor.new("Cool yellow"); - TorsoColor=BrickColor.random(); - LArmColor=BrickColor.new("Cool yellow"); - LLegColor=BrickColor.new("Pastel Blue"); - RArmColor=BrickColor.new("Cool yellow"); - RLegColor=BrickColor.new("Pastel Blue"); - elseif (PlayerColorPattern==3) then - HeadColor=BrickColor.White(); - TorsoColor=BrickColor.random(); - LArmColor=BrickColor.White(); - LLegColor=BrickColor.new("Medium blue"); - RArmColor=BrickColor.White(); - RLegColor=BrickColor.new("Medium blue"); +function InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID) + local newCharApp = Instance.new("IntValue",Player); + newCharApp.Name = "Appearance"; + --TODO - work on parse + --BODY COLORS + for i=1,6,1 do + local BodyColor = Instance.new("BrickColorValue",newCharApp); + if (i == 1) then + if (HeadColorID ~= nil) then + BodyColor.Value = BrickColor.new(HeadColorID); + else + BodyColor.Value = BrickColor.new(1); + end + elseif (i == 2) then + if (TorsoColorID ~= nil) then + BodyColor.Value = BrickColor.new(TorsoColorID); + else + BodyColor.Value = BrickColor.new(1); + end + elseif (i == 3) then + if (LeftArmColorID ~= nil) then + BodyColor.Value = BrickColor.new(LeftArmColorID); + else + BodyColor.Value = BrickColor.new(1); + end + elseif (i == 4) then + if (RightArmColorID ~= nil) then + BodyColor.Value = BrickColor.new(RightArmColorID); + else + BodyColor.Value = BrickColor.new(1); + end + elseif (i == 5) then + if (LeftLegColorID ~= nil) then + BodyColor.Value = BrickColor.new(LeftLegColorID); + else + BodyColor.Value = BrickColor.new(1); + end + elseif (i == 6) then + if (RightLegColorID ~= nil) then + BodyColor.Value = BrickColor.new(RightLegColorID); + else + BodyColor.Value = BrickColor.new(1); + end end + BodyColor.Name = "BodyColor"; + local indexValue = Instance.new("NumberValue"); + indexValue.Name = "ColorIndex"; + indexValue.Parent = BodyColor; + indexValue.Value = i; + local typeValue = Instance.new("NumberValue"); + typeValue.Name = "CustomizationType"; + typeValue.Parent = BodyColor; + typeValue.Value = 1; + end + --HATS + for i=1,3,1 do + local newHat = Instance.new("StringValue",newCharApp); + if (i == 1) then + if (RightLegColorID ~= nil) then + newHat.Value = Hat1ID; + else + newHat.Value = "NoHat.rbxm"; + end + elseif (i == 2) then + if (RightLegColorID ~= nil) then + newHat.Value = Hat2ID; + else + newHat.Value = "NoHat.rbxm"; + end + elseif (i == 3) then + if (RightLegColorID ~= nil) then + newHat.Value = Hat3ID; + else + newHat.Value = "NoHat.rbxm"; + end + end + newHat.Name = "Hat"; + local typeValue = Instance.new("NumberValue"); + typeValue.Name = "CustomizationType"; + typeValue.Parent = newHat; + typeValue.Value = 2; end end -function CSServer(Port,BodyColors) - if (rbxlegacyversion == "delta") then +function CSServer(Port) + if (rbxlegacyversion == "delta" or rbxlegacyversion == "delta-gamma" or rbxlegacyversion == "omega") then 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"); pcall(NetworkServer.Stop,NetworkServer); @@ -169,24 +191,14 @@ function CSServer(Port,BodyColors) print("Player '" .. Player.Name .. "' with ID '" .. Player.userId .. "' added"); Player:LoadCharacter(); Player.CharacterAdded:connect(function(char) - if (BodyColors == true) then - PlayerColorize(); - else - PlayerNoobify(); - end - char['Head'].BrickColor = HeadColor; - char['Torso'].BrickColor = TorsoColor; - char['Left Arm'].BrickColor = LArmColor; - char['Left Leg'].BrickColor = LLegColor; - char['Right Arm'].BrickColor = RArmColor; - char['Right Leg'].BrickColor = RLegColor; + LoadCharacterNew(newWaitForChild(Player,"Appearance"),Player.Character); end) Player.Changed:connect(function(Property) if (Property=="Character") and (Player.Character~=nil) then local Character=Player.Character; local Humanoid=Character:FindFirstChild("Humanoid"); if (Humanoid~=nil) then - Humanoid.Died:connect(function() delay(5,function() Player:LoadCharacter() end) end) + Humanoid.Died:connect(function() delay(5,function() Player:LoadCharacter() LoadCharacterNew(newWaitForChild(Player,"Appearance"),Player.Character) end) end) end end end) @@ -195,44 +207,9 @@ function CSServer(Port,BodyColors) print("Player '" .. Player.Name .. "' with ID '" .. Player.userId .. "' leaving") end) game:GetService("RunService"):Run(); - pcall(function() game.Close:connect(function() NetworkServer:Stop(); end) end); - NetworkServer.IncommingConnection:connect(IncommingConnection); - elseif (rbxlegacyversion == "delta-gamma") then - 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"); - pcall(NetworkServer.Stop,NetworkServer); - NetworkServer:Start(Port); - game:GetService("Players").PlayerAdded:connect(function(Player) - print("Player '" .. Player.Name .. "' with ID '" .. Player.userId .. "' added"); - Player:LoadCharacter(); - Player.CharacterAdded:connect(function(char) - if (BodyColors == true) then - PlayerColorize(); - else - PlayerNoobify(); - end - char['Head'].BrickColor = HeadColor; - char['Torso'].BrickColor = TorsoColor; - char['Left Arm'].BrickColor = LArmColor; - char['Left Leg'].BrickColor = LLegColor; - char['Right Arm'].BrickColor = RArmColor; - char['Right Leg'].BrickColor = RLegColor; - end) - Player.Changed:connect(function(Property) - if (Property=="Character") and (Player.Character~=nil) then - local Character=Player.Character; - local Humanoid=Character:FindFirstChild("Humanoid"); - if (Humanoid~=nil) then - Humanoid.Died:connect(function() delay(5,function() Player:LoadCharacter() end) end) - end - end - end) - end) - game:GetService("Players").PlayerRemoving:connect(function(Player) - print("Player '" .. Player.Name .. "' with ID '" .. Player.userId .. "' leaving") - end) - game:GetService("RunService"):Run(); - game.Workspace:InsertContent("rbxasset://Fonts//Health2010.rbxm"); + if (rbxlegacyversion == "delta-gamma") then + game.Workspace:InsertContent("rbxasset://Fonts//Health2010.rbxm"); + end pcall(function() game.Close:connect(function() NetworkServer:Stop(); end) end); NetworkServer.IncommingConnection:connect(IncommingConnection); else @@ -246,49 +223,18 @@ function CSServer(Port,BodyColors) game:GetService("Players").PlayerAdded:connect(function(Player) print("Player '" .. Player.Name .. "' with ID '" .. Player.userId .. "' added"); Player:LoadCharacter(); - if (BodyColors == true) then - PlayerColorize(); - else - PlayerNoobify(); - end - Player.Character['Head'].BrickColor = HeadColor; - Player.Character['Torso'].BrickColor = TorsoColor; - Player.Character['Left Arm'].BrickColor = LArmColor; - Player.Character['Left Leg'].BrickColor = LLegColor; - Player.Character['Right Arm'].BrickColor = RArmColor; - Player.Character['Right Leg'].BrickColor = RLegColor; - + LoadCharacterNew(newWaitForChild(Player,"Appearance"),Player.Character); while true do wait(0.001) if (Player.Character ~= nil) then if (Player.Character.Humanoid.Health == 0) then wait(5) Player:LoadCharacter() - if (BodyColors == true) then - PlayerColorize(); - else - PlayerNoobify(); - end - Player.Character['Head'].BrickColor = HeadColor; - Player.Character['Torso'].BrickColor = TorsoColor; - Player.Character['Left Arm'].BrickColor = LArmColor; - Player.Character['Left Leg'].BrickColor = LLegColor; - Player.Character['Right Arm'].BrickColor = RArmColor; - Player.Character['Right Leg'].BrickColor = RLegColor; + LoadCharacterNew(newWaitForChild(Player,"Appearance"),Player.Character); elseif (Player.Character.Parent == nil) then wait(5) Player:LoadCharacter() -- to make sure nobody is deleted. - if (BodyColors == true) then - PlayerColorize(); - else - PlayerNoobify(); - end - Player.Character['Head'].BrickColor = HeadColor; - Player.Character['Torso'].BrickColor = TorsoColor; - Player.Character['Left Arm'].BrickColor = LArmColor; - Player.Character['Left Leg'].BrickColor = LLegColor; - Player.Character['Right Arm'].BrickColor = RArmColor; - Player.Character['Right Leg'].BrickColor = RLegColor; + LoadCharacterNew(newWaitForChild(Player,"Appearance"),Player.Character); end end end @@ -302,8 +248,8 @@ function CSServer(Port,BodyColors) end end -function CSConnect(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,Ticket) - if (rbxlegacyversion == "delta") then +function CSConnect(UserID,ServerIP,ServerPort,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,Ticket) + if (rbxlegacyversion == "delta" or rbxlegacyversion == "delta-gamma" or rbxlegacyversion == "omega") then pcall(function() game:SetPlaceID(-1, false) end); pcall(function() game:GetService("Players"):SetChatStyle(Enum.ChatStyle.ClassicAndBubble) end); @@ -399,132 +345,11 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID, pcall(function() Player:SetMembershipType(Enum.MembershipType.BuildersClub) end); pcall(function() Player:SetAccountAge(365) end); Player:SetSuperSafeChat(false); - if (OutfitID and OutfitID ~= 0) then - Player.CharacterAppearance="http://www.roblox.com/Asset/CharacterFetch.ashx?userId="..OutfitID; - elseif (Hat1ID and Hat1ID ~= 0) then - Hat1 = "rbxasset://../../../charcustom/hats/"..Hat1ID - Hat2 = "rbxasset://../../../charcustom/hats/"..Hat2ID - Hat3 = "rbxasset://../../../charcustom/hats/"..Hat3ID - local charapp = "rbxasset://../../../charcustom/bodycolors/"..HeadColorID.."-"..TorsoColorID.."-"..LeftArmColorID.."-"..RightArmColorID.."-"..LeftLegColorID.."-"..RightLegColorID..".rbxm;"..Hat1..";"..Hat2..";"..Hat3 - player.CharacterAppearance = charapp - else - Player.CharacterAppearance=0; - end + Player.CharacterAppearance=0; pcall(function() Player.Name=PlayerName or ""; end); pcall(function() Visit:SetUploadUrl(""); end); game:GetService("Visit"); - elseif (rbxlegacyversion == "delta-gamma") then - pcall(function() game:SetPlaceID(-1, false) end); - pcall(function() game:GetService("Players"):SetChatStyle(Enum.ChatStyle.ClassicAndBubble) end); - - pcall(function() - game:GetService("GuiService").Changed:connect(function() - pcall(function() game:GetService("GuiService").ShowLegacyPlayerList=true; end); - pcall(function() game.CoreGui.RobloxGui.PlayerListScript:Remove(); end); - pcall(function() game.CoreGui.RobloxGui.PlayerListTopRightFrame:Remove(); end); - pcall(function() game.CoreGui.RobloxGui.BigPlayerListWindowImposter:Remove(); end); - pcall(function() game.CoreGui.RobloxGui.BigPlayerlist:Remove(); end); - end); - end) - game:GetService("RunService"):Run(); - assert((ServerIP~=nil and ServerPort~=nil),"CSConnect Error: ServerIP and ServerPort must be defined."); - local function SetMessage(Message) game:SetMessage(Message); end - local Visit,NetworkClient,PlayerSuccess,Player,ConnectionFailedHook=game:GetService("Visit"),game:GetService("NetworkClient"); - - local function GetClassCount(Class,Parent) - local Objects=Parent:GetChildren(); - local Number=0; - for Index,Object in pairs(Objects) do - if (Object.className==Class) then - Number=Number+1; - end - Number=Number+GetClassCount(Class,Object); - end - return Number; - end - - local function RequestCharacter(Replicator) - local Connection; - Connection=Player.Changed:connect(function(Property) - if (Property=="Character") then - game:ClearMessage(); - end - end) - SetMessage("Requesting character..."); - Replicator:RequestCharacter(); - SetMessage("Waiting for character..."); - end - - local function Disconnection(Peer,LostConnection) - SetMessage("You have lost connection to the game"); - end - - local function ConnectionAccepted(Peer,Replicator) - Replicator.Disconnection:connect(Disconnection); - local RequestingMarker=true; - game:SetMessageBrickCount(); - local Marker=Replicator:SendMarker(); - Marker.Received:connect(function() - RequestingMarker=false; - RequestCharacter(Replicator); - end) - while RequestingMarker do - Workspace:ZoomToExtents(); - wait(0.5); - end - end - - local function ConnectionFailed(Peer, Code, why) - SetMessage("Failed to connect to the Game. (ID="..Code.." ["..why.."])"); - end - - pcall(function() settings().Diagnostics:LegacyScriptMode(); end); - pcall(function() game:SetRemoteBuildMode(true); end); - SetMessage("Connecting to server..."); - NetworkClient.ConnectionAccepted:connect(ConnectionAccepted); - ConnectionFailedHook=NetworkClient.ConnectionFailed:connect(ConnectionFailed); - NetworkClient.ConnectionRejected:connect(function() - pcall(function() ConnectionFailedHook:disconnect(); end); - SetMessage("Failed to connect to the Game. (Connection rejected)"); - end) - - pcall(function() NetworkClient.Ticket=Ticket or ""; end) -- 2008 client has no ticket :O - PlayerSuccess,Player=pcall(function() return NetworkClient:PlayerConnect(UserID,ServerIP,ServerPort) end); - - if (not PlayerSuccess) then - SetMessage("Failed to connect to the Game. (Invalid IP Address)"); - NetworkClient:Disconnect(); - end - - if (not PlayerSuccess) then - local Error,Message=pcall(function() - Player=game:GetService("Players"):CreateLocalPlayer(UserID); - NetworkClient:Connect(ServerIP,ServerPort); - end); - if (not Error) then - SetMessage("Failed to connect to the Game."); - end - end - pcall(function() Player:SetUnder13(false) end); - pcall(function() Player:SetMembershipType(Enum.MembershipType.BuildersClub) end); - pcall(function() Player:SetAccountAge(365) end); - Player:SetSuperSafeChat(false); - if (OutfitID and OutfitID ~= 0) then - Player.CharacterAppearance="http://www.roblox.com/Asset/CharacterFetch.ashx?userId="..OutfitID; - elseif (Hat1ID and Hat1ID ~= 0) then - Hat1 = "rbxasset://../../../charcustom/hats/"..Hat1ID - Hat2 = "rbxasset://../../../charcustom/hats/"..Hat2ID - Hat3 = "rbxasset://../../../charcustom/hats/"..Hat3ID - local charapp = "rbxasset://../../../charcustom/bodycolors/"..HeadColorID.."-"..TorsoColorID.."-"..LeftArmColorID.."-"..RightArmColorID.."-"..LeftLegColorID.."-"..RightLegColorID..".rbxm;"..Hat1..";"..Hat2..";"..Hat3 - player.CharacterAppearance = charapp - else - Player.CharacterAppearance=0; - end - pcall(function() Player.Name=PlayerName or ""; end); - pcall(function() Visit:SetUploadUrl(""); end); - game:GetService("Visit"); - game.GuiRoot.MainMenu.Tools:Remove() - game.GuiRoot.MainMenu.Insert:Remove() + InitalizeClientAppearance(Player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID); else pcall(function() game:SetPlaceID(-1, false) end); pcall(function() game:GetService("Players"):SetChatStyle(Enum.ChatStyle.ClassicAndBubble) end); @@ -546,19 +371,10 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID, pcall(function() player:SetUnder13(false) end); pcall(function() player:SetMembershipType(Enum.MembershipType.BuildersClub) end); pcall(function() player:SetAccountAge(365) end); - if (OutfitID and OutfitID ~= 0) then - player.CharacterAppearance="http://www.roblox.com/Asset/CharacterFetch.ashx?userId="..OutfitID; - elseif (Hat1ID and Hat1ID ~= 0) then - Hat1 = "rbxasset://../../../charcustom/hats/"..Hat1ID - Hat2 = "rbxasset://../../../charcustom/hats/"..Hat2ID - Hat3 = "rbxasset://../../../charcustom/hats/"..Hat3ID - local charapp = "rbxasset://../../../charcustom/bodycolors/"..HeadColorID.."-"..TorsoColorID.."-"..LeftArmColorID.."-"..RightArmColorID.."-"..LeftLegColorID.."-"..RightLegColorID..".rbxm;"..Hat1..";"..Hat2..";"..Hat3 - player.CharacterAppearance = charapp - else - player.CharacterAppearance=0; - end + player.CharacterAppearance=0; pcall(function() player.Name=PlayerName or ""; end); game:GetService("Visit"); + InitalizeClientAppearance(player,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID); end) local function dieerror(errmsg) @@ -608,7 +424,7 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID, client.ConnectionRejected:connect(rejected) client.ConnectionFailed:connect(failed) client:Connect(ServerIP,ServerPort, 0, 20) - if (rbxlegacyversion == "pre-alpha") then + if (rbxlegacyversion == "pre-alpha" or rbxlegacyversion == "pre-alpha-ext") then game.GuiRoot.MainMenu["Toolbox"]:Remove() game.GuiRoot.MainMenu["Edit Mode"]:Remove() else @@ -626,55 +442,23 @@ function CSConnect(UserID,ServerIP,ServerPort,PlayerName,OutfitID,Hat1ID,Hat2ID, end end -function CSSolo(UserID,PlayerName,BodyColors,OutfitID,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,Ticket) +function CSSolo(UserID,PlayerName,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID,Ticket) local plr = game.Players:CreateLocalPlayer(UserID); game:GetService("RunService"):run(); - if (rbxlegacyversion == "gamma") then - game.Workspace:InsertContent("rbxasset://Fonts//Health2010.rbxm"); - elseif (rbxlegacyversion == "delta-gamma") then + if (rbxlegacyversion == "gamma" or rbxlegacyversion == "delta-gamma") then game.Workspace:InsertContent("rbxasset://Fonts//Health2010.rbxm"); end plr.Name = PlayerName; plr:LoadCharacter(); - if (BodyColors == true) then - PlayerColorize(); - else - PlayerNoobify(); - end - plr.Character['Head'].BrickColor = HeadColor; - plr.Character['Torso'].BrickColor = TorsoColor; - plr.Character['Left Arm'].BrickColor = LArmColor; - plr.Character['Left Leg'].BrickColor = LLegColor; - plr.Character['Right Arm'].BrickColor = RArmColor; - plr.Character['Right Leg'].BrickColor = RLegColor; - if (OutfitID and OutfitID ~= 0) then - plr.CharacterAppearance="http://www.roblox.com/Asset/CharacterFetch.ashx?userId="..OutfitID; - elseif (Hat1ID and Hat1ID ~= 0) then - Hat1 = "rbxasset://../../../charcustom/hats/"..Hat1ID - Hat2 = "rbxasset://../../../charcustom/hats/"..Hat2ID - Hat3 = "rbxasset://../../../charcustom/hats/"..Hat3ID - local charapp = "rbxasset://../../../charcustom/bodycolors/"..HeadColorID.."-"..TorsoColorID.."-"..LeftArmColorID.."-"..RightArmColorID.."-"..LeftLegColorID.."-"..RightLegColorID..".rbxm;"..Hat1..";"..Hat2..";"..Hat3 - plr.CharacterAppearance = charapp - else - plr.CharacterAppearance=0; - end - + plr.CharacterAppearance=0; + InitalizeClientAppearance(plr,Hat1ID,Hat2ID,Hat3ID,HeadColorID,TorsoColorID,LeftArmColorID,RightArmColorID,LeftLegColorID,RightLegColorID); + LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character); game:GetService("Visit"); while true do wait() if (plr.Character.Humanoid.Health == 0) then wait(5) plr:LoadCharacter() - if (BodyColors == true) then - PlayerColorize(); - else - PlayerNoobify(); - end - plr.Character['Head'].BrickColor = HeadColor; - plr.Character['Torso'].BrickColor = TorsoColor; - plr.Character['Left Arm'].BrickColor = LArmColor; - plr.Character['Left Leg'].BrickColor = LLegColor; - plr.Character['Right Arm'].BrickColor = RArmColor; - plr.Character['Right Leg'].BrickColor = RLegColor; + LoadCharacterNew(newWaitForChild(plr,"Appearance"),plr.Character); end end end diff --git a/RBXLegacyBatch.bat b/RBXLegacyBatch.bat new file mode 100644 index 0000000..0c3fede --- /dev/null +++ b/RBXLegacyBatch.bat @@ -0,0 +1,58 @@ +@ECHO OFF +cls +COLOR 4F +SET appname=RBXLegacy +TITLE %appname% +SET RobloxPath=%CD%\client\RobloxApp.exe +SET RobloxPathRoot=%CD%\client +SET GameLoadPath=%RobloxPathRoot:\=\\% +SET RobloxPort=53640 +SET UserID=0 +SET PlayerName=Player +SET DefaultIP=localhost +SET DefaultMap=Baseplate +GOTO MainMenu +GOTO::EOF + +:MainMenu +cls +ECHO %appname% +ECHO. +ECHO Menu Options: +ECHO 1 - JOIN SERVER +ECHO 2 - START SERVER +ECHO 0 - QUIT +SET /P LaunchId="Option: " +IF %LaunchId%==1 GOTO ClientSetup +IF %LaunchId%==2 GOTO ServerSetup +IF %LaunchId%==0 EXIT +GOTO::EOF + +:ClientSetup +cls +ECHO JOIN SERVER +ECHO. +ECHO If you don't enter an IP, the default will be used instead. +ECHO. +SET /P JoinServer="Server IP (Default: %DefaultIP%): " +IF NOT DEFINED JoinServer SET JoinServer=%DefaultIP% +ECHO Starting Roblox... +%RobloxPath% -script "dofile('%GameLoadPath%\\content\\Scripts\\CSMPFunctions.lua'); _G.CSConnect(%UserID%,'%JoinServer%',%RobloxPort%,'%PlayerName%');" +GOTO::EOF + +:ServerSetup +cls +ECHO START SERVER +ECHO. +ECHO If you don't enter a map name, the default will be used instead. +ECHO Be sure you port forward %RobloxPort% if you want to start a public server. +ECHO. +ECHO Select a map: +ECHO. +for %%a in ("%CD%\client\content\Maps\*") do @echo %%~na +ECHO. +SET /P ServerPlaceId="Type the name of the map you would like to load (Default: %DefaultMap%): " +IF NOT DEFINED ServerPlaceId SET ServerPlaceId=%DefaultMap% +ECHO Starting Roblox... +%RobloxPath% -script "dofile('%GameLoadPath%\\content\\Scripts\\CSMPFunctions.lua'); _G.CSServer(%RobloxPort%,false); game:Load('%GameLoadPath%\\content\\Maps\\%ServerPlaceId%.rbxl');" +GOTO::EOF \ No newline at end of file diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs index 130de69..a0080c7 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.Designer.cs @@ -78,6 +78,7 @@ namespace RBXLegacyLauncher this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.button40 = new System.Windows.Forms.Button(); + this.button39 = new System.Windows.Forms.Button(); this.SuspendLayout(); // // button1 @@ -477,19 +478,30 @@ namespace RBXLegacyLauncher // // button40 // - this.button40.Location = new System.Drawing.Point(170, 159); + this.button40.Location = new System.Drawing.Point(170, 187); this.button40.Name = "button40"; - this.button40.Size = new System.Drawing.Size(265, 51); + this.button40.Size = new System.Drawing.Size(265, 23); this.button40.TabIndex = 41; this.button40.Text = "Reset Colors"; this.button40.UseVisualStyleBackColor = true; this.button40.Click += new System.EventHandler(this.Button40Click); // + // button39 + // + this.button39.Location = new System.Drawing.Point(170, 159); + this.button39.Name = "button39"; + this.button39.Size = new System.Drawing.Size(265, 23); + this.button39.TabIndex = 42; + this.button39.Text = "Randomize Colors"; + this.button39.UseVisualStyleBackColor = true; + this.button39.Click += new System.EventHandler(this.Button39Click); + // // CharacterColors // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(437, 222); + this.Controls.Add(this.button39); this.Controls.Add(this.button40); this.Controls.Add(this.label2); this.Controls.Add(this.label1); @@ -539,6 +551,7 @@ namespace RBXLegacyLauncher this.Load += new System.EventHandler(this.CharacterColorsLoad); this.ResumeLayout(false); } + private System.Windows.Forms.Button button39; private System.Windows.Forms.Button button40; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.cs index 6716851..9522992 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterColors.cs @@ -22,6 +22,7 @@ namespace RBXLegacyLauncher public partial class CharacterColors : Form { public static string SelectedPart = "Head"; + public string[,] ColorArray; public CharacterColors() { @@ -30,6 +31,41 @@ namespace RBXLegacyLauncher // InitializeComponent(); + ColorArray = new string[32, 2] { + { "1", button7.BackColor.ToString() }, + { "208", button8.BackColor.ToString() }, + { "194", button9.BackColor.ToString() }, + { "199", button10.BackColor.ToString() }, + { "26", button14.BackColor.ToString() }, + { "21", button13.BackColor.ToString() }, + { "24", button12.BackColor.ToString() }, + { "226", button11.BackColor.ToString() }, + { "23", button18.BackColor.ToString() }, + { "107", button17.BackColor.ToString() }, + { "102", button16.BackColor.ToString() }, + { "11", button15.BackColor.ToString() }, + { "45", button22.BackColor.ToString() }, + { "135", button21.BackColor.ToString() }, + { "106", button20.BackColor.ToString() }, + { "105", button19.BackColor.ToString() }, + { "141", button26.BackColor.ToString() }, + { "28", button25.BackColor.ToString() }, + { "37", button24.BackColor.ToString() }, + { "119", button23.BackColor.ToString() }, + { "29", button30.BackColor.ToString() }, + { "151", button29.BackColor.ToString() }, + { "38", button28.BackColor.ToString() }, + { "192", button27.BackColor.ToString() }, + { "104", button34.BackColor.ToString() }, + { "9", button33.BackColor.ToString() }, + { "101", button32.BackColor.ToString() }, + { "5", button31.BackColor.ToString() }, + { "153", button38.BackColor.ToString() }, + { "217", button37.BackColor.ToString() }, + { "18", button36.BackColor.ToString() }, + { "125", button35.BackColor.ToString() } + }; + // // TODO: Add constructor code after the InitializeComponent() call. // @@ -360,7 +396,49 @@ namespace RBXLegacyLauncher void Button39Click(object sender, EventArgs e) { - MessageBox.Show("remove this"); + Random rand = new Random(); + int RandomColor; + + for (int i=1; i <= 6; i++) + { + RandomColor = rand.Next(ColorArray.GetLength(0)); + if (i == 1) + { + GlobalVars.HeadColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); + GlobalVars.ColorMenu_HeadColor = ColorArray[RandomColor, 1]; + button1.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_HeadColor); + } + else if (i == 2) + { + GlobalVars.TorsoColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); + GlobalVars.ColorMenu_TorsoColor = ColorArray[RandomColor, 1]; + button2.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_TorsoColor); + } + else if (i == 3) + { + GlobalVars.RightArmColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); + GlobalVars.ColorMenu_RightArmColor = ColorArray[RandomColor, 1]; + button3.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightArmColor); + } + else if (i == 4) + { + GlobalVars.LeftArmColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); + GlobalVars.ColorMenu_LeftArmColor = ColorArray[RandomColor, 1]; + button4.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftArmColor); + } + else if (i == 5) + { + GlobalVars.RightLegColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); + GlobalVars.ColorMenu_RightLegColor = ColorArray[RandomColor, 1]; + button5.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_RightLegColor); + } + else if (i == 6) + { + GlobalVars.LeftLegColorID = Convert.ToInt32(ColorArray[RandomColor, 0]); + GlobalVars.ColorMenu_LeftLegColor = ColorArray[RandomColor, 1]; + button6.BackColor = ConvertStringtoColor(GlobalVars.ColorMenu_LeftLegColor); + } + } } void Button40Click(object sender, EventArgs e) diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.Designer.cs index b95591d..0816d76 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.Designer.cs @@ -43,11 +43,18 @@ namespace RBXLegacyLauncher this.listBox3 = new System.Windows.Forms.ListBox(); this.listBox2 = new System.Windows.Forms.ListBox(); this.listBox1 = new System.Windows.Forms.ListBox(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.pictureBox2 = new System.Windows.Forms.PictureBox(); + this.pictureBox3 = new System.Windows.Forms.PictureBox(); + this.button1 = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).BeginInit(); this.SuspendLayout(); // // label17 // - this.label17.Location = new System.Drawing.Point(118, 181); + this.label17.Location = new System.Drawing.Point(155, 181); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(35, 14); this.label17.TabIndex = 43; @@ -55,7 +62,7 @@ namespace RBXLegacyLauncher // // label16 // - this.label16.Location = new System.Drawing.Point(118, 93); + this.label16.Location = new System.Drawing.Point(155, 93); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(35, 13); this.label16.TabIndex = 42; @@ -63,7 +70,7 @@ namespace RBXLegacyLauncher // // label12 // - this.label12.Location = new System.Drawing.Point(118, 5); + this.label12.Location = new System.Drawing.Point(155, 5); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(35, 13); this.label12.TabIndex = 41; @@ -96,12 +103,53 @@ namespace RBXLegacyLauncher this.listBox1.TabIndex = 38; this.listBox1.SelectedIndexChanged += new System.EventHandler(this.ListBox1SelectedIndexChanged); // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(261, 21); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(79, 69); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox1.TabIndex = 44; + this.pictureBox1.TabStop = false; + // + // pictureBox2 + // + this.pictureBox2.Location = new System.Drawing.Point(262, 109); + this.pictureBox2.Name = "pictureBox2"; + this.pictureBox2.Size = new System.Drawing.Size(79, 69); + this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox2.TabIndex = 45; + this.pictureBox2.TabStop = false; + // + // pictureBox3 + // + this.pictureBox3.Location = new System.Drawing.Point(261, 198); + this.pictureBox3.Name = "pictureBox3"; + this.pictureBox3.Size = new System.Drawing.Size(79, 69); + this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pictureBox3.TabIndex = 46; + this.pictureBox3.TabStop = false; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(12, 273); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(328, 42); + this.button1.TabIndex = 47; + this.button1.Text = "Randomize"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.Button1Click); + // // CharacterCustomization_HatMenu // 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(269, 285); + this.ClientSize = new System.Drawing.Size(353, 327); + this.Controls.Add(this.button1); + this.Controls.Add(this.pictureBox3); + this.Controls.Add(this.pictureBox2); + this.Controls.Add(this.pictureBox1); this.Controls.Add(this.label17); this.Controls.Add(this.label16); this.Controls.Add(this.label12); @@ -113,8 +161,15 @@ namespace RBXLegacyLauncher this.Name = "CharacterCustomization_HatMenu"; this.Text = "Hats"; this.Load += new System.EventHandler(this.CharacterCustomization_HatMenuLoad); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox3)).EndInit(); this.ResumeLayout(false); } + private System.Windows.Forms.Button button1; + private System.Windows.Forms.PictureBox pictureBox3; + private System.Windows.Forms.PictureBox pictureBox2; + private System.Windows.Forms.PictureBox pictureBox1; private System.Windows.Forms.ListBox listBox1; private System.Windows.Forms.ListBox listBox2; private System.Windows.Forms.ListBox listBox3; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.cs b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.cs index 986f333..a4c3a92 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/CharacterCustomization_HatMenu.cs @@ -47,11 +47,6 @@ namespace RBXLegacyLauncher continue; } - if (file.Name.Equals("TeapotTurret.rbxm") && GlobalVars.AdminMode != true) - { - continue; - } - listBox1.Items.Add(file.Name); listBox2.Items.Add(file.Name); listBox3.Items.Add(file.Name); @@ -62,22 +57,70 @@ namespace RBXLegacyLauncher listBox1.Enabled = true; listBox2.Enabled = true; listBox3.Enabled = true; + Image icon1 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox1.Image = icon1; + Image icon2 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox2.Image = icon2; + Image icon3 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox3.Image = icon3; } } void ListBox1SelectedIndexChanged(object sender, EventArgs e) { - GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); + string hatdir = Environment.CurrentDirectory + @"\\charcustom\\hats"; + if (Directory.Exists(hatdir)) + { + GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); + Image icon1 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox1.Image = icon1; + } } void ListBox2SelectedIndexChanged(object sender, EventArgs e) { - GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); + string hatdir = Environment.CurrentDirectory + @"\\charcustom\\hats"; + if (Directory.Exists(hatdir)) + { + GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); + Image icon2 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox2.Image = icon2; + } } void ListBox3SelectedIndexChanged(object sender, EventArgs e) { - GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); + string hatdir = Environment.CurrentDirectory + @"\\charcustom\\hats"; + if (Directory.Exists(hatdir)) + { + GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); + Image icon3 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox3.Image = icon3; + } + } + + void Button1Click(object sender, EventArgs e) + { + string hatdir = Environment.CurrentDirectory + @"\\charcustom\\hats"; + if (Directory.Exists(hatdir)) + { + Random random = new Random(); + int randomHat1 = random.Next(listBox1.Items.Count); + listBox1.SelectedItem = listBox1.Items[randomHat1]; + GlobalVars.Custom_Hat1ID_Offline = listBox1.SelectedItem.ToString(); + Image icon1 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat1ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox1.Image = icon1; + int randomHat2 = random.Next(listBox2.Items.Count); + listBox2.SelectedItem = listBox1.Items[randomHat2]; + GlobalVars.Custom_Hat2ID_Offline = listBox2.SelectedItem.ToString(); + Image icon2 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat2ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox2.Image = icon2; + int randomHat3 = random.Next(listBox3.Items.Count); + listBox3.SelectedItem = listBox1.Items[randomHat3]; + GlobalVars.Custom_Hat3ID_Offline = listBox3.SelectedItem.ToString(); + Image icon3 = Image.FromFile(hatdir + @"\\" + GlobalVars.Custom_Hat3ID_Offline.Replace(".rbxm", "") + ".png"); + pictureBox3.Image = icon3; + } } } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.Designer.cs index adf1173..5cbd2e0 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.Designer.cs @@ -39,8 +39,6 @@ namespace RBXLegacyLauncher System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ClientinfoEditor)); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox3 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); this.textBox1 = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); @@ -48,8 +46,6 @@ namespace RBXLegacyLauncher this.button2 = new System.Windows.Forms.Button(); this.checkBox5 = new System.Windows.Forms.CheckBox(); this.button3 = new System.Windows.Forms.Button(); - this.checkBox6 = new System.Windows.Forms.CheckBox(); - this.checkBox7 = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // checkBox1 @@ -66,60 +62,40 @@ namespace RBXLegacyLauncher // this.checkBox2.Location = new System.Drawing.Point(9, 53); this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(307, 23); + this.checkBox2.Size = new System.Drawing.Size(307, 20); this.checkBox2.TabIndex = 1; this.checkBox2.Text = "Allows the launcher to set custom IDs"; this.checkBox2.UseVisualStyleBackColor = true; this.checkBox2.CheckedChanged += new System.EventHandler(this.CheckBox2CheckedChanged); // - // checkBox3 - // - this.checkBox3.Location = new System.Drawing.Point(9, 73); - this.checkBox3.Name = "checkBox3"; - this.checkBox3.Size = new System.Drawing.Size(307, 20); - this.checkBox3.TabIndex = 2; - this.checkBox3.Text = "Allows the use of the Local Play feature"; - this.checkBox3.UseVisualStyleBackColor = true; - this.checkBox3.CheckedChanged += new System.EventHandler(this.CheckBox3CheckedChanged); - // - // checkBox4 - // - this.checkBox4.Location = new System.Drawing.Point(9, 93); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(307, 19); - this.checkBox4.TabIndex = 3; - this.checkBox4.Text = "Allows the use of the Character Outfit ID feature"; - this.checkBox4.UseVisualStyleBackColor = true; - this.checkBox4.CheckedChanged += new System.EventHandler(this.CheckBox4CheckedChanged); - // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(8, 191); + this.textBox1.Location = new System.Drawing.Point(8, 113); this.textBox1.Multiline = true; this.textBox1.Name = "textBox1"; - this.textBox1.Size = new System.Drawing.Size(310, 211); + this.textBox1.Size = new System.Drawing.Size(310, 218); this.textBox1.TabIndex = 4; this.textBox1.TextChanged += new System.EventHandler(this.TextBox1TextChanged); // // label1 // - this.label1.Location = new System.Drawing.Point(8, 172); + this.label1.Location = new System.Drawing.Point(8, 94); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(100, 16); + this.label1.Size = new System.Drawing.Size(92, 16); this.label1.TabIndex = 5; this.label1.Text = "Client Description"; // // label2 // - this.label2.Location = new System.Drawing.Point(10, 9); + this.label2.Location = new System.Drawing.Point(8, 9); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(307, 30); this.label2.TabIndex = 6; - this.label2.Text = "Check the check boxes corrisponding to what your client supports."; + this.label2.Text = "Check the check boxes corresponding to what your client supports."; // // button1 // - this.button1.Location = new System.Drawing.Point(162, 437); + this.button1.Location = new System.Drawing.Point(166, 366); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(154, 30); this.button1.TabIndex = 7; @@ -129,7 +105,7 @@ namespace RBXLegacyLauncher // // button2 // - this.button2.Location = new System.Drawing.Point(8, 437); + this.button2.Location = new System.Drawing.Point(8, 366); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(150, 30); this.button2.TabIndex = 10; @@ -139,9 +115,9 @@ namespace RBXLegacyLauncher // // checkBox5 // - this.checkBox5.Location = new System.Drawing.Point(9, 108); + this.checkBox5.Location = new System.Drawing.Point(9, 71); this.checkBox5.Name = "checkBox5"; - this.checkBox5.Size = new System.Drawing.Size(310, 25); + this.checkBox5.Size = new System.Drawing.Size(310, 20); this.checkBox5.TabIndex = 11; this.checkBox5.Text = "Loads assets from servers online"; this.checkBox5.UseVisualStyleBackColor = true; @@ -149,42 +125,20 @@ namespace RBXLegacyLauncher // // button3 // - this.button3.Location = new System.Drawing.Point(8, 408); + this.button3.Location = new System.Drawing.Point(8, 337); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(308, 23); + this.button3.Size = new System.Drawing.Size(312, 23); this.button3.TabIndex = 12; this.button3.Text = "New clientinfo.txt"; this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.Button3Click); // - // checkBox6 - // - this.checkBox6.Location = new System.Drawing.Point(9, 127); - this.checkBox6.Name = "checkBox6"; - this.checkBox6.Size = new System.Drawing.Size(307, 24); - this.checkBox6.TabIndex = 13; - this.checkBox6.Text = "This client is a \'modern\' client (Mid-2011 and above.)"; - this.checkBox6.UseVisualStyleBackColor = true; - this.checkBox6.CheckedChanged += new System.EventHandler(this.CheckBox6CheckedChanged); - // - // checkBox7 - // - this.checkBox7.Location = new System.Drawing.Point(9, 145); - this.checkBox7.Name = "checkBox7"; - this.checkBox7.Size = new System.Drawing.Size(212, 24); - this.checkBox7.TabIndex = 14; - this.checkBox7.Text = "This client supports custom characters."; - this.checkBox7.UseVisualStyleBackColor = true; - this.checkBox7.CheckedChanged += new System.EventHandler(this.CheckBox7CheckedChanged); - // // ClientinfoEditor // 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(332, 479); - this.Controls.Add(this.checkBox7); - this.Controls.Add(this.checkBox6); + this.ClientSize = new System.Drawing.Size(332, 403); this.Controls.Add(this.button3); this.Controls.Add(this.checkBox5); this.Controls.Add(this.button2); @@ -192,8 +146,6 @@ namespace RBXLegacyLauncher this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Controls.Add(this.textBox1); - this.Controls.Add(this.checkBox4); - this.Controls.Add(this.checkBox3); this.Controls.Add(this.checkBox2); this.Controls.Add(this.checkBox1); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; @@ -204,8 +156,6 @@ namespace RBXLegacyLauncher this.ResumeLayout(false); this.PerformLayout(); } - private System.Windows.Forms.CheckBox checkBox7; - private System.Windows.Forms.CheckBox checkBox6; private System.Windows.Forms.Button button3; private System.Windows.Forms.CheckBox checkBox5; private System.Windows.Forms.Button button2; @@ -213,8 +163,6 @@ namespace RBXLegacyLauncher private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.CheckBox checkBox4; - private System.Windows.Forms.CheckBox checkBox3; private System.Windows.Forms.CheckBox checkBox2; private System.Windows.Forms.CheckBox checkBox1; } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.cs b/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.cs index ba4069e..f654d3b 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.cs @@ -56,30 +56,6 @@ namespace RBXLegacyLauncher } } - void CheckBox3CheckedChanged(object sender, EventArgs e) - { - if (checkBox3.Checked == true) - { - GlobalVars.ClientCreator_SupportsLocalPlay = true; - } - else if (checkBox3.Checked == false) - { - GlobalVars.ClientCreator_SupportsLocalPlay = false; - } - } - - void CheckBox4CheckedChanged(object sender, EventArgs e) - { - if (checkBox4.Checked == true) - { - GlobalVars.ClientCreator_SupportsAppearanceID = true; - } - else if (checkBox4.Checked == false) - { - GlobalVars.ClientCreator_SupportsAppearanceID = false; - } - } - void TextBox1TextChanged(object sender, EventArgs e) { GlobalVars.ClientCreator_SelectedClientDesc = textBox1.Text; @@ -95,7 +71,7 @@ namespace RBXLegacyLauncher ofd.Title = "Load clientinfo.txt"; if (ofd.ShowDialog() == DialogResult.OK) { - string line1, line2, line3, line4, line5, line6, line7, line8; + string line1, line2, line3, line4; using(StreamReader reader = new StreamReader(ofd.FileName)) { @@ -103,10 +79,6 @@ namespace RBXLegacyLauncher line2 = reader.ReadLine(); line3 = reader.ReadLine(); line4 = reader.ReadLine(); - line5 = reader.ReadLine(); - line6 = reader.ReadLine(); - line7 = reader.ReadLine(); - line8 = reader.ReadLine(); } Boolean bline1 = bool.Parse(line1); @@ -116,29 +88,13 @@ namespace RBXLegacyLauncher GlobalVars.ClientCreator_UsesID = bline2; Boolean bline3 = bool.Parse(line3); - GlobalVars.ClientCreator_SupportsLocalPlay = bline3; + GlobalVars.ClientCreator_LoadsAssetsOnline = bline3; - Boolean bline4 = bool.Parse(line4); - GlobalVars.ClientCreator_SupportsAppearanceID = bline4; - - Boolean bline5 = bool.Parse(line5); - GlobalVars.ClientCreator_LoadsAssetsOnline = bline5; - - Boolean bline6 = bool.Parse(line6); - GlobalVars.ClientCreator_ModernClient = bline6; - - Boolean bline7 = bool.Parse(line7); - GlobalVars.ClientCreator_SupportsCharacterCustomization = bline7; - - GlobalVars.ClientCreator_SelectedClientDesc = line8; + GlobalVars.ClientCreator_SelectedClientDesc = line4; checkBox1.Checked = GlobalVars.ClientCreator_UsesPlayerName; checkBox2.Checked = GlobalVars.ClientCreator_UsesID; - checkBox3.Checked = GlobalVars.ClientCreator_SupportsLocalPlay; - checkBox4.Checked = GlobalVars.ClientCreator_SupportsAppearanceID; checkBox5.Checked = GlobalVars.ClientCreator_LoadsAssetsOnline; - checkBox6.Checked = GlobalVars.ClientCreator_ModernClient; - checkBox7.Checked = GlobalVars.ClientCreator_SupportsCharacterCustomization; textBox1.Text = GlobalVars.ClientCreator_SelectedClientDesc; } } @@ -157,12 +113,8 @@ namespace RBXLegacyLauncher { string[] lines = { GlobalVars.ClientCreator_UsesPlayerName.ToString(), - GlobalVars.ClientCreator_UsesID.ToString(), - GlobalVars.ClientCreator_SupportsLocalPlay.ToString(), - GlobalVars.ClientCreator_SupportsAppearanceID.ToString(), + GlobalVars.ClientCreator_UsesID.ToString(), GlobalVars.ClientCreator_LoadsAssetsOnline.ToString(), - GlobalVars.ClientCreator_ModernClient.ToString(), - GlobalVars.ClientCreator_SupportsCharacterCustomization.ToString(), GlobalVars.ClientCreator_SelectedClientDesc.ToString() }; File.WriteAllLines(sfd.FileName, lines); @@ -191,44 +143,12 @@ namespace RBXLegacyLauncher { GlobalVars.ClientCreator_UsesPlayerName = false; GlobalVars.ClientCreator_UsesID = false; - GlobalVars.ClientCreator_SupportsLocalPlay = false; - GlobalVars.ClientCreator_SupportsAppearanceID = false; GlobalVars.ClientCreator_LoadsAssetsOnline = false; - GlobalVars.ClientCreator_ModernClient = false; - GlobalVars.ClientCreator_SupportsCharacterCustomization = false; GlobalVars.ClientCreator_SelectedClientDesc = ""; checkBox1.Checked = GlobalVars.ClientCreator_UsesPlayerName; checkBox2.Checked = GlobalVars.ClientCreator_UsesID; - checkBox3.Checked = GlobalVars.ClientCreator_SupportsLocalPlay; - checkBox4.Checked = GlobalVars.ClientCreator_SupportsAppearanceID; checkBox5.Checked = GlobalVars.ClientCreator_LoadsAssetsOnline; - checkBox6.Checked = GlobalVars.ClientCreator_ModernClient; - checkBox7.Checked = GlobalVars.ClientCreator_SupportsCharacterCustomization; textBox1.Text = GlobalVars.ClientCreator_SelectedClientDesc; } - - void CheckBox6CheckedChanged(object sender, EventArgs e) - { - if (checkBox6.Checked == true) - { - GlobalVars.ClientCreator_ModernClient = true; - } - else if (checkBox6.Checked == false) - { - GlobalVars.ClientCreator_ModernClient = false; - } - } - - void CheckBox7CheckedChanged(object sender, EventArgs e) - { - if (checkBox7.Checked == true) - { - GlobalVars.ClientCreator_SupportsCharacterCustomization = true; - } - else if (checkBox7.Checked == false) - { - GlobalVars.ClientCreator_SupportsCharacterCustomization = false; - } - } } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.resx b/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.resx index 92e6fa6..8fcf2e5 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.resx +++ b/RBXLegacyLauncher/RBXLegacyLauncher/ClientinfoCreator.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAABAAYAEBAAAAAAIABoBAAAZgAAACAgAAAAACAAqBAAAM4EAAAwMAAAAAAgAKglAAB2FQAAQEAAAAAA diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs index 313bed7..6d3df84 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/GlobalVars.cs @@ -7,7 +7,6 @@ public static string IP = "localhost"; public static string Version = ""; //server settings. - public static bool BodyColors = true; public static string Map = "Baseplate.rbxl"; public static int RobloxPort = 53640; public static int DefaultRobloxPort = 53640; @@ -17,29 +16,17 @@ //launcher settings. public static bool CloseOnLaunch = false; public static bool LocalPlayMode = false; - public static int CharacterAppearanceID = 0; - public static bool UseAppearanceID = false; - public static bool UseCustomAppearanceID = false; //client shit public static string SelectedClient = ""; public static bool UsesPlayerName = false; public static bool UsesID = true; - public static bool SupportsLocalPlay = true; - public static bool SupportsAppearanceID = false; public static string SelectedClientDesc = ""; public static bool LoadsAssetsOnline = false; - public static bool ModernClient = false; - public static bool SupportsCharacterCustomization = false; - public static bool AdminMode = false; //clientinfocreator public static bool ClientCreator_UsesPlayerName = false; public static bool ClientCreator_UsesID = false; - public static bool ClientCreator_SupportsLocalPlay = false; - public static bool ClientCreator_SupportsAppearanceID = false; public static bool ClientCreator_LoadsAssetsOnline = false; - public static bool ClientCreator_ModernClient = false; public static string ClientCreator_SelectedClientDesc = ""; - public static bool ClientCreator_SupportsCharacterCustomization = false; //charcustom public static string Custom_Hat1ID_Offline = "NoHat.rbxm"; public static string Custom_Hat2ID_Offline = "NoHat.rbxm"; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs index d7438b6..c60d36c 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.Designer.cs @@ -81,7 +81,6 @@ namespace RBXLegacyLauncher this.label40 = new System.Windows.Forms.Label(); this.button11 = new System.Windows.Forms.Button(); this.button9 = new System.Windows.Forms.Button(); - this.checkBox5 = new System.Windows.Forms.CheckBox(); this.button8 = new System.Windows.Forms.Button(); this.button7 = new System.Windows.Forms.Button(); this.label35 = new System.Windows.Forms.Label(); @@ -91,13 +90,11 @@ namespace RBXLegacyLauncher this.label33 = new System.Windows.Forms.Label(); this.label31 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.checkBox2 = new System.Windows.Forms.CheckBox(); - this.checkBox4 = new System.Windows.Forms.CheckBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.label29 = new System.Windows.Forms.Label(); this.checkBox3 = new System.Windows.Forms.CheckBox(); this.tabPage7 = new System.Windows.Forms.TabPage(); this.richTextBox1 = new System.Windows.Forms.RichTextBox(); + this.tabPage8 = new System.Windows.Forms.TabPage(); + this.richTextBox2 = new System.Windows.Forms.RichTextBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.label11 = new System.Windows.Forms.Label(); this.label10 = new System.Windows.Forms.Label(); @@ -130,6 +127,7 @@ namespace RBXLegacyLauncher this.tabPage6.SuspendLayout(); this.tabPage5.SuspendLayout(); this.tabPage7.SuspendLayout(); + this.tabPage8.SuspendLayout(); this.tabPage4.SuspendLayout(); this.SuspendLayout(); // @@ -156,6 +154,7 @@ namespace RBXLegacyLauncher this.tabControl1.Controls.Add(this.tabPage6); this.tabControl1.Controls.Add(this.tabPage5); this.tabControl1.Controls.Add(this.tabPage7); + this.tabControl1.Controls.Add(this.tabPage8); this.tabControl1.Controls.Add(this.tabPage4); this.tabControl1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tabControl1.Location = new System.Drawing.Point(12, 137); @@ -588,7 +587,6 @@ namespace RBXLegacyLauncher this.tabPage5.Controls.Add(this.label40); this.tabPage5.Controls.Add(this.button11); this.tabPage5.Controls.Add(this.button9); - this.tabPage5.Controls.Add(this.checkBox5); this.tabPage5.Controls.Add(this.button8); this.tabPage5.Controls.Add(this.button7); this.tabPage5.Controls.Add(this.label35); @@ -598,10 +596,6 @@ namespace RBXLegacyLauncher this.tabPage5.Controls.Add(this.label33); this.tabPage5.Controls.Add(this.label31); this.tabPage5.Controls.Add(this.label2); - this.tabPage5.Controls.Add(this.checkBox2); - this.tabPage5.Controls.Add(this.checkBox4); - this.tabPage5.Controls.Add(this.textBox3); - this.tabPage5.Controls.Add(this.label29); this.tabPage5.Controls.Add(this.checkBox3); this.tabPage5.Location = new System.Drawing.Point(4, 22); this.tabPage5.Name = "tabPage5"; @@ -622,9 +616,9 @@ namespace RBXLegacyLauncher // // button11 // - this.button11.Location = new System.Drawing.Point(95, 170); + this.button11.Location = new System.Drawing.Point(95, 160); this.button11.Name = "button11"; - this.button11.Size = new System.Drawing.Size(212, 21); + this.button11.Size = new System.Drawing.Size(212, 20); this.button11.TabIndex = 38; this.button11.Text = "SAVE PORT TO SAVED PORTS LIST"; this.button11.UseVisualStyleBackColor = true; @@ -640,24 +634,13 @@ namespace RBXLegacyLauncher this.button9.UseVisualStyleBackColor = true; this.button9.Click += new System.EventHandler(this.Button9Click); // - // checkBox5 - // - this.checkBox5.Location = new System.Drawing.Point(241, 18); - this.checkBox5.Name = "checkBox5"; - this.checkBox5.Size = new System.Drawing.Size(149, 24); - this.checkBox5.TabIndex = 36; - this.checkBox5.Text = "Use Custom Outfits"; - this.checkBox5.UseVisualStyleBackColor = true; - this.checkBox5.CheckedChanged += new System.EventHandler(this.CheckBox5CheckedChanged); - // // button8 // - this.button8.Enabled = false; - this.button8.Location = new System.Drawing.Point(241, 42); + this.button8.Location = new System.Drawing.Point(96, 19); this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(149, 42); + this.button8.Size = new System.Drawing.Size(212, 52); this.button8.TabIndex = 35; - this.button8.Text = "Customize Character (Advanced)"; + this.button8.Text = "Customize Character"; this.button8.UseVisualStyleBackColor = true; this.button8.Click += new System.EventHandler(this.Button8Click); // @@ -674,7 +657,7 @@ namespace RBXLegacyLauncher // // label35 // - this.label35.Location = new System.Drawing.Point(84, 126); + this.label35.Location = new System.Drawing.Point(83, 115); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(234, 16); this.label35.TabIndex = 33; @@ -683,7 +666,7 @@ namespace RBXLegacyLauncher // // textBox4 // - this.textBox4.Location = new System.Drawing.Point(96, 145); + this.textBox4.Location = new System.Drawing.Point(97, 134); this.textBox4.Name = "textBox4"; this.textBox4.Size = new System.Drawing.Size(211, 20); this.textBox4.TabIndex = 32; @@ -725,52 +708,12 @@ namespace RBXLegacyLauncher // // label2 // - this.label2.Location = new System.Drawing.Point(96, 5); + this.label2.Location = new System.Drawing.Point(95, 3); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(222, 13); this.label2.TabIndex = 27; this.label2.Text = "PLAYER OPTIONS AND CUSTOMIZATION"; // - // checkBox2 - // - this.checkBox2.Checked = true; - this.checkBox2.CheckState = System.Windows.Forms.CheckState.Checked; - this.checkBox2.Location = new System.Drawing.Point(114, 106); - this.checkBox2.Name = "checkBox2"; - this.checkBox2.Size = new System.Drawing.Size(176, 17); - this.checkBox2.TabIndex = 26; - this.checkBox2.Text = "Random Body Color Patterns"; - this.checkBox2.UseVisualStyleBackColor = true; - this.checkBox2.CheckedChanged += new System.EventHandler(this.CheckBox2CheckedChanged); - // - // checkBox4 - // - this.checkBox4.Location = new System.Drawing.Point(32, 21); - this.checkBox4.Name = "checkBox4"; - this.checkBox4.Size = new System.Drawing.Size(147, 18); - this.checkBox4.TabIndex = 25; - this.checkBox4.Text = "Use Character Outfit IDs"; - this.checkBox4.UseVisualStyleBackColor = true; - this.checkBox4.CheckedChanged += new System.EventHandler(this.CheckBox4CheckedChanged); - // - // textBox3 - // - this.textBox3.Location = new System.Drawing.Point(32, 64); - this.textBox3.Name = "textBox3"; - this.textBox3.Size = new System.Drawing.Size(147, 20); - this.textBox3.TabIndex = 24; - this.textBox3.Text = "0"; - this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.textBox3.TextChanged += new System.EventHandler(this.TextBox3TextChanged); - // - // label29 - // - this.label29.Location = new System.Drawing.Point(14, 42); - this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(201, 19); - this.label29.TabIndex = 23; - this.label29.Text = "Character ID (Optional, used for outfits)"; - // // checkBox3 // this.checkBox3.Location = new System.Drawing.Point(150, 212); @@ -790,7 +733,7 @@ namespace RBXLegacyLauncher this.tabPage7.Padding = new System.Windows.Forms.Padding(3); this.tabPage7.Size = new System.Drawing.Size(405, 284); this.tabPage7.TabIndex = 7; - this.tabPage7.Text = "DEV CONSOLE"; + this.tabPage7.Text = "CMD"; // // richTextBox1 // @@ -804,6 +747,27 @@ namespace RBXLegacyLauncher this.richTextBox1.Text = ""; this.richTextBox1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.richTextBox1_KeyDown); // + // tabPage8 + // + this.tabPage8.Controls.Add(this.richTextBox2); + this.tabPage8.Location = new System.Drawing.Point(4, 22); + this.tabPage8.Name = "tabPage8"; + this.tabPage8.Padding = new System.Windows.Forms.Padding(3); + this.tabPage8.Size = new System.Drawing.Size(405, 284); + this.tabPage8.TabIndex = 8; + this.tabPage8.Text = "CHANGES"; + this.tabPage8.UseVisualStyleBackColor = true; + // + // richTextBox2 + // + this.richTextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.richTextBox2.Location = new System.Drawing.Point(6, 6); + this.richTextBox2.Name = "richTextBox2"; + this.richTextBox2.ReadOnly = true; + this.richTextBox2.Size = new System.Drawing.Size(393, 272); + this.richTextBox2.TabIndex = 2; + this.richTextBox2.Text = ""; + // // tabPage4 // this.tabPage4.Controls.Add(this.label11); @@ -1080,10 +1044,13 @@ namespace RBXLegacyLauncher this.tabPage5.ResumeLayout(false); this.tabPage5.PerformLayout(); this.tabPage7.ResumeLayout(false); + this.tabPage8.ResumeLayout(false); this.tabPage4.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); } + private System.Windows.Forms.RichTextBox richTextBox2; + private System.Windows.Forms.TabPage tabPage8; private System.Windows.Forms.RichTextBox richTextBox1; private System.Windows.Forms.TabPage tabPage7; private System.Windows.Forms.Button button20; @@ -1110,7 +1077,6 @@ namespace RBXLegacyLauncher private System.Windows.Forms.Button button9; private System.Windows.Forms.TextBox textBox6; private System.Windows.Forms.Button button8; - private System.Windows.Forms.CheckBox checkBox5; private System.Windows.Forms.TextBox textBox5; private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label31; @@ -1122,10 +1088,7 @@ namespace RBXLegacyLauncher private System.Windows.Forms.TabPage tabPage5; private System.Windows.Forms.Label label32; private System.Windows.Forms.Label label30; - private System.Windows.Forms.CheckBox checkBox4; private System.Windows.Forms.Button button6; - private System.Windows.Forms.Label label29; - private System.Windows.Forms.TextBox textBox3; private System.Windows.Forms.Label label28; private System.Windows.Forms.Label label27; private System.Windows.Forms.CheckBox checkBox3; @@ -1143,7 +1106,6 @@ namespace RBXLegacyLauncher private System.Windows.Forms.Button button4; private System.Windows.Forms.Label label13; private System.Windows.Forms.Label label12; - private System.Windows.Forms.CheckBox checkBox2; private System.Windows.Forms.Label label19; private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label16; diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs index 8e72a67..62cd53a 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.cs @@ -130,6 +130,14 @@ namespace RBXLegacyLauncher string defcl = defaultclient[1]; GlobalVars.SelectedClient = defcl; ConsolePrint("RBXLegacy Launcher version " + version + " loaded. Initializing config.", 4); + if (File.Exists("changelog.txt")) + { + richTextBox2.Text = File.ReadAllText("changelog.txt"); + } + else + { + ConsolePrint("ERROR 4 - changelog.txt not found.", 2); + } if (!File.Exists("config.txt")) { ConsolePrint("WARNING 1 - config.txt not found. Creating one with default values.", 5); @@ -142,7 +150,7 @@ namespace RBXLegacyLauncher } if (!File.Exists("ports.txt")) { - ConsolePrint("WARNING 2 - servers.txt not found. Creating empty file.", 5); + ConsolePrint("WARNING 3 - ports.txt not found. Creating empty file.", 5); File.Create("ports.txt").Dispose(); } GlobalVars.ClientDir = Path.Combine(Environment.CurrentDirectory, @"clients"); @@ -164,7 +172,7 @@ namespace RBXLegacyLauncher void ReadConfigValues() { - string line1, line2, line3, line4, line5, line6, line7, line8, line9, line10, line11, line12, line13, line14, line15, line16, line17, line18, line19, line20, line21, line22, line23, line24, line25; + string line1, line2, line3, line4, line5, line6, line7, line8, line9, line10, line11, line12, line13, line14, line15, line16, line17, line18, line19, line20, line21; using(StreamReader reader = new StreamReader("config.txt")) { @@ -188,63 +196,52 @@ namespace RBXLegacyLauncher line18 = reader.ReadLine(); line19 = reader.ReadLine(); line20 = reader.ReadLine(); - line21 = reader.ReadLine(); - line22 = reader.ReadLine(); - line23 = reader.ReadLine(); - line24 = reader.ReadLine(); - line25 = reader.ReadLine(); + line21 = reader.ReadLine(); } bool bline1 = Convert.ToBoolean(line1); GlobalVars.CloseOnLaunch = bline1; - bool bline2 = Convert.ToBoolean(line2); - GlobalVars.BodyColors = bline2; + int iline2 = Convert.ToInt32(line2); + GlobalVars.UserID = iline2; - int iline3 = Convert.ToInt32(line3); - GlobalVars.UserID = iline3; + GlobalVars.PlayerName = line3; - GlobalVars.PlayerName = line4; + GlobalVars.SelectedClient = line4; - GlobalVars.SelectedClient = line5; + GlobalVars.Map = line5; int iline6 = Convert.ToInt32(line6); - GlobalVars.CharacterAppearanceID = iline6; + GlobalVars.RobloxPort = iline6; - bool bline7 = Convert.ToBoolean(line7); - GlobalVars.UseAppearanceID = bline7; + GlobalVars.Custom_Hat1ID_Offline = line7; + GlobalVars.Custom_Hat2ID_Offline = line8; + GlobalVars.Custom_Hat3ID_Offline = line9; - GlobalVars.Map = line8; + int iline10 = Convert.ToInt32(line10); + GlobalVars.HeadColorID = iline10; - int iline9 = Convert.ToInt32(line9); - GlobalVars.RobloxPort = iline9; + int iline11 = Convert.ToInt32(line11); + GlobalVars.TorsoColorID = iline11; - bool bline10 = Convert.ToBoolean(line10); - GlobalVars.UseCustomAppearanceID = bline10; + int iline12 = Convert.ToInt32(line12); + GlobalVars.LeftArmColorID = iline12; - GlobalVars.Custom_Hat1ID_Offline = line11; - GlobalVars.Custom_Hat2ID_Offline = line12; - GlobalVars.Custom_Hat3ID_Offline = line13; + int iline13 = Convert.ToInt32(line13); + GlobalVars.RightArmColorID = iline13; int iline14 = Convert.ToInt32(line14); - GlobalVars.HeadColorID = iline14; - int iline15 = Convert.ToInt32(line15); - GlobalVars.TorsoColorID = iline15; - int iline16 = Convert.ToInt32(line16); - GlobalVars.LeftArmColorID = iline16; - int iline17 = Convert.ToInt32(line17); - GlobalVars.RightArmColorID = iline17; - int iline18 = Convert.ToInt32(line18); - GlobalVars.LeftLegColorID = iline18; - int iline19 = Convert.ToInt32(line19); - GlobalVars.RightLegColorID = iline19; + GlobalVars.LeftLegColorID = iline14; - GlobalVars.ColorMenu_HeadColor = line20; - GlobalVars.ColorMenu_TorsoColor = line21; - GlobalVars.ColorMenu_LeftArmColor = line22; - GlobalVars.ColorMenu_RightArmColor = line23; - GlobalVars.ColorMenu_LeftLegColor = line24; - GlobalVars.ColorMenu_RightLegColor = line25; + int iline15 = Convert.ToInt32(line15); + GlobalVars.RightLegColorID = iline15; + + GlobalVars.ColorMenu_HeadColor = line16; + GlobalVars.ColorMenu_TorsoColor = line17; + GlobalVars.ColorMenu_LeftArmColor = line18; + GlobalVars.ColorMenu_RightArmColor = line19; + GlobalVars.ColorMenu_LeftLegColor = line20; + GlobalVars.ColorMenu_RightLegColor = line21; if (GlobalVars.CloseOnLaunch == true) { @@ -255,50 +252,14 @@ namespace RBXLegacyLauncher checkBox1.Checked = false; } - if (GlobalVars.BodyColors == true) - { - checkBox2.Checked = true; - } - else if (GlobalVars.BodyColors == false) - { - checkBox2.Checked = false; - } - - if (GlobalVars.UseAppearanceID == true) - { - textBox3.Enabled = true; - checkBox4.Enabled = true; - checkBox4.Checked = true; - checkBox5.Enabled = false; - } - else if (GlobalVars.UseAppearanceID == false) - { - textBox3.Enabled = false; - checkBox4.Enabled = false; - checkBox4.Checked = false; - if (GlobalVars.SupportsCharacterCustomization == true) - { - checkBox5.Enabled = true; - } - } - - if (GlobalVars.UseCustomAppearanceID == false) - { - checkBox5.Checked = false; - } - else if (GlobalVars.UseCustomAppearanceID == true) - { - checkBox5.Checked = true; - } - - if (iline3 == 0) + if (iline2 == 0) { GeneratePlayerID(); WriteConfigValues(); } else { - textBox5.Text = Convert.ToString(iline3); + textBox5.Text = Convert.ToString(iline2); } textBox2.Text = GlobalVars.PlayerName; @@ -306,7 +267,6 @@ namespace RBXLegacyLauncher label26.Text = GlobalVars.SelectedClient; label28.Text = GlobalVars.Map; listBox1.SelectedItem = GlobalVars.Map; - textBox3.Text = GlobalVars.CharacterAppearanceID.ToString(); textBox4.Text = GlobalVars.RobloxPort.ToString(); label37.Text = GlobalVars.IP; label38.Text = GlobalVars.RobloxPort.ToString(); @@ -318,15 +278,11 @@ namespace RBXLegacyLauncher { string[] lines = { GlobalVars.CloseOnLaunch.ToString(), - GlobalVars.BodyColors.ToString(), GlobalVars.UserID.ToString(), GlobalVars.PlayerName.ToString(), GlobalVars.SelectedClient.ToString(), - GlobalVars.CharacterAppearanceID.ToString(), - GlobalVars.UseAppearanceID.ToString(), GlobalVars.Map.ToString(), GlobalVars.RobloxPort.ToString(), - GlobalVars.UseCustomAppearanceID.ToString(), GlobalVars.Custom_Hat1ID_Offline.ToString(), GlobalVars.Custom_Hat2ID_Offline.ToString(), GlobalVars.Custom_Hat3ID_Offline.ToString(), @@ -350,15 +306,11 @@ namespace RBXLegacyLauncher void ResetConfigValues() { GlobalVars.CloseOnLaunch = false; - GlobalVars.BodyColors = true; GlobalVars.UserID = 0; GlobalVars.PlayerName = "Player"; GlobalVars.SelectedClient = "Mid-2008"; - GlobalVars.CharacterAppearanceID = 0; - GlobalVars.UseAppearanceID = false; GlobalVars.Map = "Baseplate.rbxl"; GlobalVars.RobloxPort = 53640; - GlobalVars.UseCustomAppearanceID = false; GlobalVars.Custom_Hat1ID_Offline = "NoHat.rbxm"; GlobalVars.Custom_Hat2ID_Offline = "NoHat.rbxm"; GlobalVars.Custom_Hat3ID_Offline = "NoHat.rbxm"; @@ -390,7 +342,7 @@ namespace RBXLegacyLauncher GlobalVars.SelectedClient = "2008"; } - string line1, line2, line3, line4, line5, line6, line7, line8; + string line1, line2, line3, line4; using(StreamReader reader = new StreamReader(clientpath)) { @@ -398,10 +350,6 @@ namespace RBXLegacyLauncher line2 = reader.ReadLine(); line3 = reader.ReadLine(); line4 = reader.ReadLine(); - line5 = reader.ReadLine(); - line6 = reader.ReadLine(); - line7 = reader.ReadLine(); - line8 = reader.ReadLine(); } bool bline1 = Convert.ToBoolean(line1); @@ -411,21 +359,9 @@ namespace RBXLegacyLauncher GlobalVars.UsesID = bline2; bool bline3 = Convert.ToBoolean(line3); - GlobalVars.SupportsLocalPlay = bline3; + GlobalVars.LoadsAssetsOnline = bline3; - bool bline4 = Convert.ToBoolean(line4); - GlobalVars.SupportsAppearanceID = bline4; - - bool bline5 = Convert.ToBoolean(line5); - GlobalVars.LoadsAssetsOnline = bline5; - - bool bline6 = Convert.ToBoolean(line6); - GlobalVars.ModernClient = bline6; - - bool bline7 = Convert.ToBoolean(line7); - GlobalVars.SupportsCharacterCustomization = bline7; - - GlobalVars.SelectedClientDesc = line8; + GlobalVars.SelectedClientDesc = line4; if (GlobalVars.UsesPlayerName == true) { @@ -440,6 +376,10 @@ namespace RBXLegacyLauncher { textBox5.Enabled = true; button4.Enabled = true; + if (GlobalVars.IP.Equals("localhost")) + { + checkBox3.Enabled = true; + } } else if (GlobalVars.UsesID == false) { @@ -449,51 +389,6 @@ namespace RBXLegacyLauncher GlobalVars.LocalPlayMode = false; } - if (GlobalVars.SupportsLocalPlay == false) - { - checkBox3.Enabled = false; - GlobalVars.LocalPlayMode = false; - } - else if (GlobalVars.SupportsLocalPlay == true) - { - checkBox3.Enabled = true; - } - - if (GlobalVars.SupportsAppearanceID == false) - { - checkBox4.Enabled = false; - checkBox4.Checked = false; - textBox3.Enabled = false; - GlobalVars.UseAppearanceID = false; - } - else if (GlobalVars.SupportsAppearanceID == true) - { - if (GlobalVars.UseCustomAppearanceID == false) - { - checkBox4.Enabled = true; - } - - if (GlobalVars.UseAppearanceID == false) - { - textBox3.Enabled = false; - checkBox4.Checked = false; - if (GlobalVars.SupportsCharacterCustomization == true) - { - checkBox5.Enabled = true; - } - } - else if (GlobalVars.UseAppearanceID == true) - { - textBox3.Enabled = true; - checkBox4.Checked = true; - if (GlobalVars.SupportsCharacterCustomization == true) - { - checkBox5.Enabled = false; - button8.Enabled = false; - } - } - } - if (GlobalVars.LoadsAssetsOnline == false) { label30.Visible = false; @@ -503,18 +398,6 @@ namespace RBXLegacyLauncher label30.Visible = true; } - if (GlobalVars.SupportsCharacterCustomization == true) - { - checkBox5.Enabled = true; - } - else if (GlobalVars.SupportsCharacterCustomization == false) - { - checkBox5.Enabled = false; - checkBox5.Checked = false; - button8.Enabled = false; - GlobalVars.UseCustomAppearanceID = false; - } - textBox6.Text = GlobalVars.SelectedClientDesc; label26.Text = GlobalVars.SelectedClient; ConsolePrint("Client '" + GlobalVars.SelectedClient + "' successfully loaded.", 3); @@ -587,17 +470,6 @@ namespace RBXLegacyLauncher GlobalVars.CloseOnLaunch = false; } } - void CheckBox2CheckedChanged(object sender, EventArgs e) - { - if (checkBox2.Checked == true) - { - GlobalVars.BodyColors = true; - } - else if (checkBox2.Checked == false) - { - GlobalVars.BodyColors = false; - } - } void Button4Click(object sender, EventArgs e) { @@ -633,89 +505,12 @@ namespace RBXLegacyLauncher } } - void TextBox3TextChanged(object sender, EventArgs e) - { - int parsedValue; - if (int.TryParse(textBox3.Text, out parsedValue)) - { - if (textBox3.Text.Equals("")) - { - GlobalVars.CharacterAppearanceID = 0; - } - else - { - GlobalVars.CharacterAppearanceID = Convert.ToInt32(textBox3.Text); - } - } - else - { - GlobalVars.CharacterAppearanceID = 0; - } - } - void Button6Click(object sender, EventArgs e) { ClientinfoEditor cie = new ClientinfoEditor(); cie.Show(); } - void CheckBox4CheckedChanged(object sender, EventArgs e) - { - if (GlobalVars.SupportsAppearanceID == true) - { - if (checkBox4.Checked == true) - { - GlobalVars.UseAppearanceID = true; - textBox3.Enabled = true; - GlobalVars.UseCustomAppearanceID = false; - if (GlobalVars.SupportsCharacterCustomization == true) - { - checkBox5.Enabled = false; - button8.Enabled = false; - if (checkBox5.Checked == true) - { - GlobalVars.UseCustomAppearanceID = false; - checkBox5.Checked = false; - } - } - } - else if (checkBox4.Checked == false) - { - GlobalVars.UseAppearanceID = false; - textBox3.Enabled = false; - if (GlobalVars.SupportsCharacterCustomization == true) - { - checkBox5.Enabled = true; - } - } - } - } - - bool IsUsingCharacterOutfitIDs() - { - if (GlobalVars.SupportsAppearanceID == false && GlobalVars.UseAppearanceID == false) - return false; - - if (GlobalVars.SupportsAppearanceID == false) - return false; - - if (GlobalVars.UseAppearanceID == false) - return false; - - return true; - } - - bool IsUsingCustomOutfits() - { - if (GlobalVars.SupportsCharacterCustomization == false) - return false; - - if (GlobalVars.UseCustomAppearanceID == false) - return false; - - return true; - } - void Button7Click(object sender, EventArgs e) { WriteConfigValues(); @@ -764,33 +559,6 @@ namespace RBXLegacyLauncher } } - void CheckBox5CheckedChanged(object sender, EventArgs e) - { - if (checkBox5.Checked == true) - { - GlobalVars.UseCustomAppearanceID = true; - button8.Enabled = true; - if (GlobalVars.SupportsAppearanceID == true) - { - checkBox4.Enabled = false; - if (checkBox4.Checked == true) - { - GlobalVars.UseAppearanceID = false; - checkBox4.Checked = false; - } - } - } - else if (checkBox5.Checked == false) - { - GlobalVars.UseCustomAppearanceID = false; - button8.Enabled = false; - if (GlobalVars.SupportsAppearanceID == true) - { - checkBox4.Enabled = true; - } - } - } - void Button8Click(object sender, EventArgs e) { CharacterCustomization ccustom = new CharacterCustomization(); @@ -943,53 +711,21 @@ namespace RBXLegacyLauncher string HatIDOffline1 = GlobalVars.Custom_Hat1ID_Offline; string HatIDOffline2 = GlobalVars.Custom_Hat2ID_Offline; string HatIDOffline3 = GlobalVars.Custom_Hat3ID_Offline; - if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) + if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.CharacterAppearanceID + ");" + quote; + args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) + else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.CharacterAppearanceID + ");" + quote; + args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) + else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "'," + GlobalVars.CharacterAppearanceID + ");" + quote; + args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) + else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false) { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player'," + GlobalVars.CharacterAppearanceID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "',0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player',0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "',0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player',0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "');" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(" + GlobalVars.UserID + ",'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player');" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'" + GlobalVars.PlayerName + "');" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player');" + quote; + args = "-script " + quote + "dofile('" + luafile + "'); _G.CSConnect(0,'" + GlobalVars.IP + "'," + GlobalVars.RobloxPort + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; } try { @@ -1013,108 +749,21 @@ namespace RBXLegacyLauncher string HatIDOffline1 = GlobalVars.Custom_Hat1ID_Offline; string HatIDOffline2 = GlobalVars.Custom_Hat2ID_Offline; string HatIDOffline3 = GlobalVars.Custom_Hat3ID_Offline; - - if (GlobalVars.BodyColors == true) + if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true) { - if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "',true," + GlobalVars.CharacterAppearanceID + ");" + quote; + args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) + else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true) { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player',true," + GlobalVars.CharacterAppearanceID + ");" + quote; + args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) + else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false) { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "',true," + GlobalVars.CharacterAppearanceID + ");" + quote; + args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) + else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false ) { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'Player',true," + GlobalVars.CharacterAppearanceID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "',true,0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player',true,0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "',true,0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'Player',true,0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "',true);" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player',true);" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "',true);" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'Player',true);" + quote; - } - } - else if (GlobalVars.BodyColors == false) - { - if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "',false," + GlobalVars.CharacterAppearanceID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player',false," + GlobalVars.CharacterAppearanceID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "',false," + GlobalVars.CharacterAppearanceID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'Player',false," + GlobalVars.CharacterAppearanceID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "',false,0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player',false,0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "',false,0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'Player',false,0,'" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'" + GlobalVars.PlayerName + "',false);" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == true && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(" + GlobalVars.UserID + ",'Player',false);" + quote; - } - else if (GlobalVars.UsesPlayerName == true && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'" + GlobalVars.PlayerName + "',false);" + quote; - } - else if (GlobalVars.UsesPlayerName == false && GlobalVars.UsesID == false && !IsUsingCharacterOutfitIDs() && !IsUsingCustomOutfits()) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'Player',false);" + quote; - } + args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSSolo(0,'Player','" + HatIDOffline1 + "','" + HatIDOffline2 + "','" + HatIDOffline3 + "'," + GlobalVars.HeadColorID + "," + GlobalVars.TorsoColorID + "," + GlobalVars.LeftArmColorID + "," + GlobalVars.RightArmColorID + "," + GlobalVars.LeftLegColorID + "," + GlobalVars.RightLegColorID + ");" + quote; } try { @@ -1135,15 +784,7 @@ namespace RBXLegacyLauncher string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; string args = ""; - - if (GlobalVars.BodyColors == true) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSServer(" + GlobalVars.RobloxPort + ",true); " + quote; - } - else if (GlobalVars.BodyColors == false) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSServer(" + GlobalVars.RobloxPort + ",false);" + quote; - } + args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSServer(" + GlobalVars.RobloxPort + "); " + quote; try { ConsolePrint("Server Loaded.", 4); @@ -1163,14 +804,7 @@ namespace RBXLegacyLauncher string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; string args = ""; - if (GlobalVars.BodyColors == true) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSServer(" + GlobalVars.RobloxPort + ",true); " + quote + " -no3d"; - } - else if (GlobalVars.BodyColors == false) - { - args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSServer(" + GlobalVars.RobloxPort + ",false);" + quote + " -no3d"; - } + args = quote + mapfile + "\" -script \"dofile('" + luafile + "'); _G.CSServer(" + GlobalVars.RobloxPort + "); " + quote + " -no3d"; try { ConsolePrint("Server Loaded in No3d.", 4); @@ -1185,18 +819,12 @@ namespace RBXLegacyLauncher void StartStudio() { - string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; + string luafile = "rbxasset://scripts\\\\CSMPFunctions.lua"; string mapfile = GlobalVars.MapsDir + @"\\" + GlobalVars.Map; + string rbxexe = GlobalVars.ClientDir + @"\\" + GlobalVars.SelectedClient + @"\\RobloxApp.exe"; string quote = "\""; string args = ""; - if (GlobalVars.ModernClient == true) - { - args = quote + mapfile + "\" -script \"" + @"loadstring('\108\111\99\97\108\32\67\111\114\101\71\117\105\32\61\32\103\97\109\101\58\71\101\116\83\101\114\118\105\99\101\40\34\67\111\114\101\71\117\105\34\41\59\10\119\104\105\108\101\32\110\111\116\32\67\111\114\101\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\82\111\98\108\111\120\71\117\105\34\41\32\100\111\10\9\67\111\114\101\71\117\105\46\67\104\105\108\100\65\100\100\101\100\58\119\97\105\116\40\41\59\10\101\110\100\10\108\111\99\97\108\32\82\111\98\108\111\120\71\117\105\32\61\32\67\111\114\101\71\117\105\46\82\111\98\108\111\120\71\117\105\59\10\108\111\99\97\108\32\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\32\61\32\82\111\98\108\111\120\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\34\41\10\108\111\99\97\108\32\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\32\61\32\82\111\98\108\111\120\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\34\41\10\108\111\99\97\108\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\32\61\32\82\111\98\108\111\120\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\84\111\112\76\101\102\116\67\111\110\116\114\111\108\34\41\10\108\111\99\97\108\32\66\117\105\108\100\84\111\111\108\115\32\61\32\82\111\98\108\111\120\71\117\105\58\70\105\110\100\70\105\114\115\116\67\104\105\108\100\40\34\66\117\105\108\100\84\111\111\108\115\34\41\10\102\117\110\99\116\105\111\110\32\109\97\107\101\89\82\101\108\97\116\105\118\101\40\41\10\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\50\10\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\50\10\105\102\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\32\116\104\101\110\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\50\32\101\110\100\10\105\102\32\66\117\105\108\100\84\111\111\108\115\32\116\104\101\110\32\66\117\105\108\100\84\111\111\108\115\46\70\114\97\109\101\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\50\32\101\110\100\10\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\80\111\115\105\116\105\111\110\32\61\32\85\68\105\109\50\46\110\101\119\40\48\44\48\44\49\44\45\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\89\41\10\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\80\111\115\105\116\105\111\110\32\61\32\85\68\105\109\50\46\110\101\119\40\49\44\45\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\88\44\49\44\45\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\89\41\10\101\110\100\10\102\117\110\99\116\105\111\110\32\109\97\107\101\88\82\101\108\97\116\105\118\101\40\41\10\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\49\10\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\49\10\105\102\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\32\116\104\101\110\32\84\111\112\76\101\102\116\67\111\110\116\114\111\108\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\49\32\101\110\100\10\105\102\32\66\117\105\108\100\84\111\111\108\115\32\116\104\101\110\32\66\117\105\108\100\84\111\111\108\115\46\70\114\97\109\101\46\83\105\122\101\67\111\110\115\116\114\97\105\110\116\32\61\32\49\32\101\110\100\10\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\80\111\115\105\116\105\111\110\32\61\32\85\68\105\109\50\46\110\101\119\40\48\44\48\44\49\44\45\66\111\116\116\111\109\76\101\102\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\89\41\10\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\80\111\115\105\116\105\111\110\32\61\32\85\68\105\109\50\46\110\101\119\40\49\44\45\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\88\44\49\44\45\66\111\116\116\111\109\82\105\103\104\116\67\111\110\116\114\111\108\46\65\98\115\111\108\117\116\101\83\105\122\101\46\89\41\10\101\110\100\10\108\111\99\97\108\32\102\117\110\99\116\105\111\110\32\114\101\115\105\122\101\40\41\10\105\102\32\82\111\98\108\111\120\71\117\105\46\65\98\115\111\108\117\116\101\83\105\122\101\46\120\32\62\32\82\111\98\108\111\120\71\117\105\46\65\98\115\111\108\117\116\101\83\105\122\101\46\121\32\116\104\101\110\10\109\97\107\101\89\82\101\108\97\116\105\118\101\40\41\10\101\108\115\101\10\109\97\107\101\88\82\101\108\97\116\105\118\101\40\41\10\101\110\100\10\101\110\100\10\82\111\98\108\111\120\71\117\105\46\67\104\97\110\103\101\100\58\99\111\110\110\101\99\116\40\102\117\110\99\116\105\111\110\40\112\114\111\112\101\114\116\121\41\10\105\102\32\112\114\111\112\101\114\116\121\32\61\61\32\34\65\98\115\111\108\117\116\101\83\105\122\101\34\32\116\104\101\110\10\119\97\105\116\40\41\10\114\101\115\105\122\101\40\41\10\101\110\100\10\101\110\100\41\10\119\97\105\116\40\41\10\114\101\115\105\122\101\40\41\10')()"; - } - else if (GlobalVars.ModernClient == false) - { - args = quote + mapfile + quote; - } + args = quote + mapfile + "\" -script \"dofile('" + luafile + "');" + quote; try { ConsolePrint("Studio Loaded.", 4); @@ -1286,12 +914,6 @@ namespace RBXLegacyLauncher { ConsoleRBXLegacyHelp(true); } - else if (command.Equals("rbxlegacy kanrisha")) - { - GlobalVars.AdminMode = true; - ConsolePrint("ADMIN MODE ENABLED.", 4); - ConsolePrint("YOU ARE GOD.", 2, false); - } else { ConsolePrint("ERROR 3 - Command is either not registered or valid", 2, false); @@ -1314,14 +936,14 @@ namespace RBXLegacyLauncher ConsolePrint("rbxlegacy", 1); ConsolePrint("---------", 1); ConsolePrint("= client | Loads client with launcher settings", 1); - ConsolePrint("== solo | Loads client in Play Solo mode 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("-- 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("-- save | Saves the config file", 1); + ConsolePrint("-- load | Reloads the config file", 1); + ConsolePrint("-- reset | Resets the config file", 1, false); } } } diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.resx b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.resx index f3665cf..52e7305 100644 --- a/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.resx +++ b/RBXLegacyLauncher/RBXLegacyLauncher/MainForm.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAAh0AAABxCAMAAABGF+HdAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -209,7 +209,7 @@ WARNING: This client loads assets directly from a server. This means that you may not be able to play it over a LAN or local connection without internet access. This may also mean that some things won't load (i.e the healthbar) - ROBLOX and the ROBLOX Clients were made by the ROBLOX Corporation. The ROBLOX Corporation does not support or endorse the creation of RBXLegacy. Bitl is not affiliated with the ROBLOX Corporation or its subsidiaries. Bitl does not own any of the content included with RBXLegacy. LUA scripts were used to build a client that can connect to LAN and the Internet. The LUA scripts used were borrowed from the RBXPri client and merged into 1 single script. All credit for the LUA code included with the RBXPri client goes to the RBXPri team. All credit for the LUA code used with "non-modern" clients goes to Scripter John and EnergyCell. + ROBLOX and the ROBLOX Clients were made by the ROBLOX Corporation. The ROBLOX Corporation does not support or endorse the creation of RBXLegacy. Bitl is not affiliated with the ROBLOX Corporation or its subsidiaries. Bitl does not own any of the content included with RBXLegacy. LUA scripts were used to build a client that can connect to LAN and the Internet. The LUA scripts used were borrowed from the RBXPri client and merged into 1 single script. All credit for the LUA code included with the RBXPri client goes to the RBXPri team. All credit for the LUA code used with "non-modern" clients goes to Scripter John and EnergyCell. All credit for the LUA code used for character customization goes to RBXBanLand. diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterColors.resources b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterColors.resources deleted file mode 100644 index ebc3208..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterColors.resources and /dev/null differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterCustomization.resources b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterCustomization.resources deleted file mode 100644 index ebc3208..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterCustomization.resources and /dev/null differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterCustomization_HatMenu.resources b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterCustomization_HatMenu.resources deleted file mode 100644 index ebc3208..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.CharacterCustomization_HatMenu.resources and /dev/null differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.ClientinfoEditor.resources b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.ClientinfoEditor.resources deleted file mode 100644 index ebc3208..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.ClientinfoEditor.resources and /dev/null differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.MainForm.resources b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.MainForm.resources deleted file mode 100644 index dee78b2..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.MainForm.resources and /dev/null differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.ServerInfo.resources b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.ServerInfo.resources deleted file mode 100644 index ebc3208..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.ServerInfo.resources and /dev/null differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.FileListAbsolute.txt b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.FileListAbsolute.txt deleted file mode 100644 index 3329e2f..0000000 --- a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,11 +0,0 @@ -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\bin\Release\RBXLegacyLauncher.exe.config -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\bin\Release\RBXLegacyLauncher.exe -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.csprojResolveAssemblyReference.cache -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.CharacterColors.resources -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.CharacterCustomization.resources -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.ClientinfoEditor.resources -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.MainForm.resources -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.ServerInfo.resources -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.csproj.GenerateResource.Cache -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.exe -C:\Users\BITL\Documents\GitHub\RBXLegacy-src\RBXLegacyLauncher\RBXLegacyLauncher\obj\Release\RBXLegacyLauncher.CharacterCustomization_HatMenu.resources diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.GenerateResource.Cache b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.GenerateResource.Cache deleted file mode 100644 index ba48059..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csproj.GenerateResource.Cache and /dev/null differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csprojResolveAssemblyReference.cache b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csprojResolveAssemblyReference.cache deleted file mode 100644 index 8c03152..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.csprojResolveAssemblyReference.cache and /dev/null differ diff --git a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.exe b/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.exe deleted file mode 100644 index 84774ec..0000000 Binary files a/RBXLegacyLauncher/RBXLegacyLauncher/obj/Release/RBXLegacyLauncher.exe and /dev/null differ diff --git a/RBXLegacySetup.iss b/RBXLegacySetup.iss index fe87a63..0e17c45 100644 --- a/RBXLegacySetup.iss +++ b/RBXLegacySetup.iss @@ -25,17 +25,19 @@ SolidCompression=yes Name: "english"; MessagesFile: "compiler:Default.isl" [Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked -Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1 +Name: "desktopicon"; Description: "Create a icon on your Desktop"; GroupDescription: "Icons" +Name: "quicklaunchicon"; Description: "Create a icon on your Quick Start Menu"; GroupDescription: "Icons"; Flags: unchecked; OnlyBelowVersion: 0,6.1 [Files] Source: "RBXLegacy\RBXLegacyLauncher.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "RBXLegacy\RBXLegacyLauncher.exe.config"; DestDir: "{app}"; Flags: ignoreversion -Source: "RBXLegacy\README.TXT"; DestDir: "{app}"; Flags: ignoreversion isreadme +Source: "RBXLegacy\README.TXT"; DestDir: "{app}"; Flags: ignoreversion +Source: "RBXLegacy\changelog.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "RBXLegacy\info.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "RBXLegacy\clients\*"; DestDir: "{app}\clients"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "RBXLegacy\maps\*"; DestDir: "{app}\maps"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "RBXLegacy\models\*"; DestDir: "{app}\models"; Flags: ignoreversion recursesubdirs createallsubdirs +Source: "RBXLegacy\charcustom\*"; DestDir: "{app}\models"; Flags: ignoreversion recursesubdirs createallsubdirs [Icons] Name: "{group}\RBXLegacy"; Filename: "{app}\RBXLegacyLauncher.exe" @@ -44,4 +46,6 @@ Name: "{commondesktop}\RBXLegacy"; Filename: "{app}\RBXLegacyLauncher.exe"; Task Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\RBXLegacy"; Filename: "{app}\RBXLegacyLauncher.exe"; Tasks: quicklaunchicon [Run] -Filename: "{app}\RBXLegacyLauncher.exe"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,RBXLegacy}" +Filename: "{app}\RBXLegacyLauncher.exe"; Description: "Play RBXLegacy"; Flags: nowait postinstall skipifsilent +Filename: "{app}\README.TXT"; Description: "View the README file"; Flags: postinstall shellexec skipifsilent unchecked +Filename: "{app}\changelog.txt"; Description: "View the changelog"; Flags: postinstall shellexec skipifsilent unchecked diff --git a/charcustom/bodycolors.7z b/charcustom/bodycolors.7z deleted file mode 100644 index bcf06ac..0000000 Binary files a/charcustom/bodycolors.7z and /dev/null differ diff --git a/charcustom/hats/2007RobloxVisor.png b/charcustom/hats/2007RobloxVisor.png new file mode 100644 index 0000000..f40472b Binary files /dev/null and b/charcustom/hats/2007RobloxVisor.png differ diff --git a/charcustom/hats/2008RobloxVisor.png b/charcustom/hats/2008RobloxVisor.png new file mode 100644 index 0000000..4b15565 Binary files /dev/null and b/charcustom/hats/2008RobloxVisor.png differ diff --git a/charcustom/hats/2009RobloxVisor.png b/charcustom/hats/2009RobloxVisor.png new file mode 100644 index 0000000..c291dca Binary files /dev/null and b/charcustom/hats/2009RobloxVisor.png differ diff --git a/charcustom/hats/BCHardHat.png b/charcustom/hats/BCHardHat.png new file mode 100644 index 0000000..44a3207 Binary files /dev/null and b/charcustom/hats/BCHardHat.png differ diff --git a/charcustom/hats/BlueBaseballCap.png b/charcustom/hats/BlueBaseballCap.png new file mode 100644 index 0000000..e8748bb Binary files /dev/null and b/charcustom/hats/BlueBaseballCap.png differ diff --git a/charcustom/hats/BlueSteelBatHelm.png b/charcustom/hats/BlueSteelBatHelm.png new file mode 100644 index 0000000..7f18ba8 Binary files /dev/null and b/charcustom/hats/BlueSteelBatHelm.png differ diff --git a/charcustom/hats/Darkseed.png b/charcustom/hats/Darkseed.png new file mode 100644 index 0000000..de4c83d Binary files /dev/null and b/charcustom/hats/Darkseed.png differ diff --git a/charcustom/hats/DominoCrown.png b/charcustom/hats/DominoCrown.png new file mode 100644 index 0000000..48686ad Binary files /dev/null and b/charcustom/hats/DominoCrown.png differ diff --git a/charcustom/hats/EeriePumpkinHead.png b/charcustom/hats/EeriePumpkinHead.png new file mode 100644 index 0000000..4d25dbe Binary files /dev/null and b/charcustom/hats/EeriePumpkinHead.png differ diff --git a/charcustom/hats/FlashingBolt.png b/charcustom/hats/FlashingBolt.png new file mode 100644 index 0000000..f9f795b Binary files /dev/null and b/charcustom/hats/FlashingBolt.png differ diff --git a/charcustom/hats/FrozenNorth.png b/charcustom/hats/FrozenNorth.png new file mode 100644 index 0000000..49bb4e1 Binary files /dev/null and b/charcustom/hats/FrozenNorth.png differ diff --git a/charcustom/hats/GreatTree.png b/charcustom/hats/GreatTree.png new file mode 100644 index 0000000..f2a2f2f Binary files /dev/null and b/charcustom/hats/GreatTree.png differ diff --git a/charcustom/hats/GreenTopHat.png b/charcustom/hats/GreenTopHat.png new file mode 100644 index 0000000..32e605a Binary files /dev/null and b/charcustom/hats/GreenTopHat.png differ diff --git a/charcustom/hats/NinjaMaskOfAwesomeness.png b/charcustom/hats/NinjaMaskOfAwesomeness.png new file mode 100644 index 0000000..238239a Binary files /dev/null and b/charcustom/hats/NinjaMaskOfAwesomeness.png differ diff --git a/charcustom/hats/NinjaMaskOfLight.png b/charcustom/hats/NinjaMaskOfLight.png new file mode 100644 index 0000000..e566e2d Binary files /dev/null and b/charcustom/hats/NinjaMaskOfLight.png differ diff --git a/charcustom/hats/NoHat.png b/charcustom/hats/NoHat.png new file mode 100644 index 0000000..081f49a Binary files /dev/null and b/charcustom/hats/NoHat.png differ diff --git a/charcustom/hats/OBCHardHat.png b/charcustom/hats/OBCHardHat.png new file mode 100644 index 0000000..efaa3a6 Binary files /dev/null and b/charcustom/hats/OBCHardHat.png differ diff --git a/charcustom/hats/OhNoes.png b/charcustom/hats/OhNoes.png new file mode 100644 index 0000000..06d3d54 Binary files /dev/null and b/charcustom/hats/OhNoes.png differ diff --git a/charcustom/hats/PirateHat.png b/charcustom/hats/PirateHat.png new file mode 100644 index 0000000..f125691 Binary files /dev/null and b/charcustom/hats/PirateHat.png differ diff --git a/charcustom/hats/PoliceCap.png b/charcustom/hats/PoliceCap.png new file mode 100644 index 0000000..188ed99 Binary files /dev/null and b/charcustom/hats/PoliceCap.png differ diff --git a/charcustom/hats/PumpkinHead.png b/charcustom/hats/PumpkinHead.png new file mode 100644 index 0000000..5a97a78 Binary files /dev/null and b/charcustom/hats/PumpkinHead.png differ diff --git a/charcustom/hats/PurpleTopHat.png b/charcustom/hats/PurpleTopHat.png new file mode 100644 index 0000000..2ecda0c Binary files /dev/null and b/charcustom/hats/PurpleTopHat.png differ diff --git a/charcustom/hats/RBXLegacyVisor.png b/charcustom/hats/RBXLegacyVisor.png new file mode 100644 index 0000000..f8a54ba Binary files /dev/null and b/charcustom/hats/RBXLegacyVisor.png differ diff --git a/charcustom/hats/RedBaseballCap.png b/charcustom/hats/RedBaseballCap.png new file mode 100644 index 0000000..1593b6f Binary files /dev/null and b/charcustom/hats/RedBaseballCap.png differ diff --git a/charcustom/hats/RedTopHat.png b/charcustom/hats/RedTopHat.png new file mode 100644 index 0000000..5965c8e Binary files /dev/null and b/charcustom/hats/RedTopHat.png differ diff --git a/charcustom/hats/SecretFire.png b/charcustom/hats/SecretFire.png new file mode 100644 index 0000000..ba708b9 Binary files /dev/null and b/charcustom/hats/SecretFire.png differ diff --git a/charcustom/hats/ShadowNinjaMask.png b/charcustom/hats/ShadowNinjaMask.png new file mode 100644 index 0000000..4327d4d Binary files /dev/null and b/charcustom/hats/ShadowNinjaMask.png differ diff --git a/charcustom/hats/Sombrero.png b/charcustom/hats/Sombrero.png new file mode 100644 index 0000000..dae4a95 Binary files /dev/null and b/charcustom/hats/Sombrero.png differ diff --git a/charcustom/hats/SparkleTimeFedora.png b/charcustom/hats/SparkleTimeFedora.png new file mode 100644 index 0000000..c1f968d Binary files /dev/null and b/charcustom/hats/SparkleTimeFedora.png differ diff --git a/charcustom/hats/StrawHat.png b/charcustom/hats/StrawHat.png new file mode 100644 index 0000000..be07e85 Binary files /dev/null and b/charcustom/hats/StrawHat.png differ diff --git a/charcustom/hats/TBCHardHat.png b/charcustom/hats/TBCHardHat.png new file mode 100644 index 0000000..8656a57 Binary files /dev/null and b/charcustom/hats/TBCHardHat.png differ diff --git a/charcustom/hats/TeapotHat.png b/charcustom/hats/TeapotHat.png new file mode 100644 index 0000000..b5a2cf9 Binary files /dev/null and b/charcustom/hats/TeapotHat.png differ diff --git a/charcustom/hats/TeapotHat.rbxm b/charcustom/hats/TeapotHat.rbxm new file mode 100644 index 0000000..61d7634 --- /dev/null +++ b/charcustom/hats/TeapotHat.rbxm @@ -0,0 +1,118 @@ + + null + nil + + + + 0 + 0.25 + 0.100000001 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 1 + + 2 + TeapotHat + true + + + + false + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + 194 + + 7.96006393 + 0.801764309 + 8.7839489 + -0.209644035 + -0.00530963205 + 0.977763355 + -0.000722747762 + 0.999985814 + 0.00527534308 + -0.977777541 + 0.000399267912 + -0.209644899 + + true + true + 0 + true + true + false + 0.5 + 2 + 0.300000012 + -0.5 + 0.5 + 0 + 0 + -0.5 + 0.5 + 0 + 0 + true + Handle + 0 + -0.5 + 0.5 + 0 + 0 + + 0 + 0 + 0 + + -0.5 + 0.5 + 0 + 0 + 0 + + 0 + 0 + 0 + + true + 1 + + 2 + 0.800000012 + 1 + + + + + rbxasset://../../../charcustom/hats/fonts/teapot.mesh + 5 + Mesh + + 2 + 2 + 2 + + rbxasset://../../../charcustom/hats/textures/teapot.png + + 1 + 1 + 1 + + true + + + + + \ No newline at end of file diff --git a/charcustom/hats/TheDusekkar.png b/charcustom/hats/TheDusekkar.png new file mode 100644 index 0000000..985abde Binary files /dev/null and b/charcustom/hats/TheDusekkar.png differ diff --git a/charcustom/hats/VikingHelm.png b/charcustom/hats/VikingHelm.png new file mode 100644 index 0000000..dd82e62 Binary files /dev/null and b/charcustom/hats/VikingHelm.png differ diff --git a/charcustom/hats/VoidStar.png b/charcustom/hats/VoidStar.png new file mode 100644 index 0000000..6b7ba7c Binary files /dev/null and b/charcustom/hats/VoidStar.png differ diff --git a/charcustom/hats/WhiteTopHat.png b/charcustom/hats/WhiteTopHat.png new file mode 100644 index 0000000..9e787ef Binary files /dev/null and b/charcustom/hats/WhiteTopHat.png differ diff --git a/charcustom/hats/fedora.png b/charcustom/hats/fedora.png new file mode 100644 index 0000000..12f0d6e Binary files /dev/null and b/charcustom/hats/fedora.png differ diff --git a/charcustom/hats/headphones.png b/charcustom/hats/headphones.png new file mode 100644 index 0000000..64ab7aa Binary files /dev/null and b/charcustom/hats/headphones.png differ diff --git a/charcustom/hats/shades.png b/charcustom/hats/shades.png new file mode 100644 index 0000000..285867c Binary files /dev/null and b/charcustom/hats/shades.png differ diff --git a/charcustom/hats/textures/teapot.png b/charcustom/hats/textures/teapot.png new file mode 100644 index 0000000..55efe85 Binary files /dev/null and b/charcustom/hats/textures/teapot.png differ diff --git a/cut/3.1.rbxm b/cut/3.1.rbxm new file mode 100644 index 0000000..f17cd42 --- /dev/null +++ b/cut/3.1.rbxm @@ -0,0 +1,146 @@ + + 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 new file mode 100644 index 0000000..9ad9763 --- /dev/null +++ b/cut/Health2011.rbxm @@ -0,0 +1,388 @@ + + 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/charcustom/TeapotTurret.png b/cut/charcustom/TeapotTurret.png new file mode 100644 index 0000000..cd8afc8 Binary files /dev/null and b/cut/charcustom/TeapotTurret.png differ diff --git a/charcustom/hats/TeapotTurret.rbxm b/cut/charcustom/TeapotTurret.rbxm similarity index 100% rename from charcustom/hats/TeapotTurret.rbxm rename to cut/charcustom/TeapotTurret.rbxm diff --git a/charcustom/hats/fonts/Satellite.mesh b/cut/charcustom/fonts/Satellite.mesh similarity index 100% rename from charcustom/hats/fonts/Satellite.mesh rename to cut/charcustom/fonts/Satellite.mesh diff --git a/charcustom/hats/fonts/gravityhammer.mesh b/cut/charcustom/fonts/gravityhammer.mesh similarity index 100% rename from charcustom/hats/fonts/gravityhammer.mesh rename to cut/charcustom/fonts/gravityhammer.mesh diff --git a/charcustom/hats/sounds/Activation.wav b/cut/charcustom/sounds/Activation.wav similarity index 100% rename from charcustom/hats/sounds/Activation.wav rename to cut/charcustom/sounds/Activation.wav diff --git a/charcustom/hats/sounds/Katon.mp3 b/cut/charcustom/sounds/Katon.mp3 similarity index 100% rename from charcustom/hats/sounds/Katon.mp3 rename to cut/charcustom/sounds/Katon.mp3 diff --git a/charcustom/hats/sounds/gravityhammerswing.mp3 b/cut/charcustom/sounds/gravityhammerswing.mp3 similarity index 100% rename from charcustom/hats/sounds/gravityhammerswing.mp3 rename to cut/charcustom/sounds/gravityhammerswing.mp3 diff --git a/charcustom/hats/sounds/hurray.wav b/cut/charcustom/sounds/hurray.wav similarity index 100% rename from charcustom/hats/sounds/hurray.wav rename to cut/charcustom/sounds/hurray.wav diff --git a/charcustom/hats/textures/Satellite.png b/cut/charcustom/textures/Satellite.png similarity index 100% rename from charcustom/hats/textures/Satellite.png rename to cut/charcustom/textures/Satellite.png diff --git a/charcustom/hats/textures/gravityhammer.png b/cut/charcustom/textures/gravityhammer.png similarity index 100% rename from charcustom/hats/textures/gravityhammer.png rename to cut/charcustom/textures/gravityhammer.png diff --git a/charcustom/hats/textures/gravityhammericon.png b/cut/charcustom/textures/gravityhammericon.png similarity index 100% rename from charcustom/hats/textures/gravityhammericon.png rename to cut/charcustom/textures/gravityhammericon.png diff --git a/cut/healthgui/Bar.png b/cut/healthgui/Bar.png new file mode 100644 index 0000000..9c6d9d4 Binary files /dev/null and b/cut/healthgui/Bar.png differ diff --git a/cut/healthgui/BarRed.png b/cut/healthgui/BarRed.png new file mode 100644 index 0000000..11504fb Binary files /dev/null and b/cut/healthgui/BarRed.png differ diff --git a/cut/healthgui/HurtOverlay.png b/cut/healthgui/HurtOverlay.png new file mode 100644 index 0000000..8ba9733 Binary files /dev/null and b/cut/healthgui/HurtOverlay.png differ diff --git a/cut/healthgui/bkg.png b/cut/healthgui/bkg.png new file mode 100644 index 0000000..1234597 Binary files /dev/null and b/cut/healthgui/bkg.png differ diff --git a/cut/healthgui/label.png b/cut/healthgui/label.png new file mode 100644 index 0000000..45e055f Binary files /dev/null and b/cut/healthgui/label.png differ diff --git a/sky/greenscreen.png b/sky/greenscreen.png new file mode 100644 index 0000000..7f4698f Binary files /dev/null and b/sky/greenscreen.png differ