diff --git a/public/asset/12 b/public/asset/12 index 818fe9e..fa42d26 100644 --- a/public/asset/12 +++ b/public/asset/12 @@ -1,4 +1,4 @@ -%12% +%12% -- This script creates almost all gui elements found in the backpack (warning: there are a lot!) -- TODO: automate this process @@ -221,23 +221,21 @@ Backpack.Active = true InventoryButton.ZIndex = 3 InventoryButton.Parent = Tabs - if game.CoreGui.Version >= 8 then - local WardrobeButton = Instance.new("TextButton") - WardrobeButton.RobloxLocked = true - WardrobeButton.Name = "WardrobeButton" - WardrobeButton.Size = UDim2.new(0,90,0,30) - WardrobeButton.Position = UDim2.new(0,77,1,-31) - WardrobeButton.BackgroundColor3 = Color3.new(0,0,0) - WardrobeButton.BorderColor3 = Color3.new(1,1,1) - WardrobeButton.Font = Enum.Font.ArialBold - WardrobeButton.FontSize = Enum.FontSize.Size18 - WardrobeButton.Text = "Wardrobe" - WardrobeButton.AutoButtonColor = false - WardrobeButton.TextColor3 = Color3.new(1,1,1) - WardrobeButton.Selected = false - WardrobeButton.Active = true - WardrobeButton.Parent = Tabs - end + local WardrobeButton = Instance.new("TextButton") + WardrobeButton.RobloxLocked = true + WardrobeButton.Name = "WardrobeButton" + WardrobeButton.Size = UDim2.new(0,90,0,30) + WardrobeButton.Position = UDim2.new(0,77,1,-31) + WardrobeButton.BackgroundColor3 = Color3.new(0,0,0) + WardrobeButton.BorderColor3 = Color3.new(1,1,1) + WardrobeButton.Font = Enum.Font.ArialBold + WardrobeButton.FontSize = Enum.FontSize.Size18 + WardrobeButton.Text = "Wardrobe" + WardrobeButton.AutoButtonColor = false + WardrobeButton.TextColor3 = Color3.new(1,1,1) + WardrobeButton.Selected = false + WardrobeButton.Active = true + WardrobeButton.Parent = Tabs local closeButton = Instance.new("TextButton") closeButton.RobloxLocked = true @@ -256,8 +254,8 @@ Backpack.Active = true local XImage = Instance.new("ImageLabel") XImage.RobloxLocked = true XImage.Name = "XImage" - game:GetService("ContentProvider"):Preload("http://www.morblox.us/asset/?id=75547445") - XImage.Image = "http://www.morblox.us/asset/?id=75547445" --TODO: move to rbxasset + game:GetService("ContentProvider"):Preload("http://morblox.us/asset/?id=75547445") + XImage.Image = "http://morblox.us/asset/?id=75547445" --TODO: move to rbxasset XImage.BackgroundTransparency = 1 XImage.Position = UDim2.new(-.25,-1,-.25,-1) XImage.Size = UDim2.new(1.5,2,1.5,2) @@ -529,12 +527,6 @@ Backpack.Active = true AttributeThreeImage.Parent = GearIcons ------------------------------- WARDROBE ------------------------------------------------------- - if game.CoreGui.Version < 8 then - -- no need for this to stick around, we aren't ready for wardrobe - script:remove() - return - end - local function makeCharFrame(frameName, parent) local frame = Instance.new("Frame") frame.RobloxLocked = true @@ -684,24 +676,24 @@ Backpack.Active = true --CharacterPane Children local FaceFrame = makeCharFrame("FacesFrame", CharacterPane) - game:GetService("ContentProvider"):Preload("http://www.morblox.us/asset/?id=75460621") - makeZone("FaceZone","http://www.morblox.us/asset/?id=75460621",UDim2.new(0,157,0,137),UDim2.new(0.5,-78,0.5,-68),FaceFrame) + game:GetService("ContentProvider"):Preload("http://morblox.us/asset/?id=75460621") + makeZone("FaceZone","http://morblox.us/asset/?id=75460621",UDim2.new(0,157,0,137),UDim2.new(0.5,-78,0.5,-68),FaceFrame) makeStyledButton("Face",UDim2.new(0,64,0,64),UDim2.new(0.5,-32,0.5,-135),FaceFrame) local HeadFrame = makeCharFrame("HeadsFrame", CharacterPane) - makeZone("FaceZone","http://www.morblox.us/asset/?id=75460621",UDim2.new(0,157,0,137),UDim2.new(0.5,-78,0.5,-68),HeadFrame) + makeZone("FaceZone","http://morblox.us/asset/?id=75460621",UDim2.new(0,157,0,137),UDim2.new(0.5,-78,0.5,-68),HeadFrame) makeStyledButton("Head",UDim2.new(0,64,0,64),UDim2.new(0.5,-32,0.5,-135),HeadFrame) local HatsFrame = makeCharFrame("HatsFrame", CharacterPane) - game:GetService("ContentProvider"):Preload("http://www.morblox.us/asset/?id=75457888") - local HatsZone = makeZone("HatsZone","http://www.morblox.us/asset/?id=75457888",UDim2.new(0,186,0,184),UDim2.new(0.5,-93,0.5,-100), HatsFrame) + game:GetService("ContentProvider"):Preload("http://morblox.us/asset/?id=75457888") + local HatsZone = makeZone("HatsZone","http://morblox.us/asset/?id=75457888",UDim2.new(0,186,0,184),UDim2.new(0.5,-93,0.5,-100), HatsFrame) makeStyledButton("Hat1Button",UDim2.new(0,64,0,64),UDim2.new(0,-1,0,-1),HatsZone,Enum.ButtonStyle.RobloxButton) makeStyledButton("Hat2Button",UDim2.new(0,64,0,64),UDim2.new(0,63,0,-1),HatsZone,Enum.ButtonStyle.RobloxButton) makeStyledButton("Hat3Button",UDim2.new(0,64,0,64),UDim2.new(0,127,0,-1),HatsZone,Enum.ButtonStyle.RobloxButton) local PantsFrame = makeCharFrame("PantsFrame", CharacterPane) - game:GetService("ContentProvider"):Preload("http://www.morblox.us/asset/?id=75457920") - makeZone("PantsZone","http://www.morblox.us/asset/?id=75457920",UDim2.new(0,121,0,99),UDim2.new(0.5,-60,0.5,-100),PantsFrame) + game:GetService("ContentProvider"):Preload("http://morblox.us/asset/?id=75457920") + makeZone("PantsZone","http://morblox.us/asset/?id=75457920",UDim2.new(0,121,0,99),UDim2.new(0.5,-60,0.5,-100),PantsFrame) local pantFrame = Instance.new("Frame") pantFrame.RobloxLocked = true @@ -739,19 +731,19 @@ Backpack.Active = true makeTextLabel("LeftArmLabel","Left Arm",UDim2.new(0.5,-16,0,-25),leftArmButton) local TShirtFrame = makeCharFrame("T-ShirtsFrame",CharacterPane) - game:GetService("ContentProvider"):Preload("http://www.morblox.us/asset/?id=75460642") - makeZone("TShirtZone","http://www.morblox.us/asset/?id=75460642",UDim2.new(0,121,0,154),UDim2.new(0.5,-60,0.5,-100),TShirtFrame) + game:GetService("ContentProvider"):Preload("http://morblox.us/asset/?id=75460642") + makeZone("TShirtZone","http://morblox.us/asset/?id=75460642",UDim2.new(0,121,0,154),UDim2.new(0.5,-60,0.5,-100),TShirtFrame) makeStyledButton("TShirtButton", UDim2.new(0,64,0,64),UDim2.new(0.5,-32,0.5,-64),TShirtFrame) local ShirtFrame = makeCharFrame("ShirtsFrame", CharacterPane) - makeZone("ShirtZone","http://www.morblox.us/asset/?id=75460642",UDim2.new(0,121,0,154),UDim2.new(0.5,-60,0.5,-100),ShirtFrame) + makeZone("ShirtZone","http://morblox.us/asset/?id=75460642",UDim2.new(0,121,0,154),UDim2.new(0.5,-60,0.5,-100),ShirtFrame) makeStyledButton("ShirtButton", UDim2.new(0,64,0,64),UDim2.new(0.5,-32,0.5,-64),ShirtFrame) local ColorFrame = makeCharFrame("ColorFrame", CharacterPane) - game:GetService("ContentProvider"):Preload("http://www.morblox.us/asset/?id=76049888") - local ColorZone = makeZone("ColorZone","http://www.morblox.us/asset/?id=76049888", UDim2.new(0,120,0,150),UDim2.new(0.5,-60,0.5,-100),ColorFrame) + game:GetService("ContentProvider"):Preload("http://morblox.us/asset/?id=76049888") + local ColorZone = makeZone("ColorZone","http://morblox.us/asset/?id=76049888", UDim2.new(0,120,0,150),UDim2.new(0.5,-60,0.5,-100),ColorFrame) makeStyledButton("Head",UDim2.new(0.26,0,0.19,0),UDim2.new(0.37,0,0.02,0),ColorZone).AutoButtonColor = false makeStyledButton("LeftArm",UDim2.new(0.19,0,0.36,0),UDim2.new(0.78,0,0.26,0),ColorZone).AutoButtonColor = false makeStyledButton("RightArm",UDim2.new(0.19,0,0.36,0),UDim2.new(0.025,0,0.26,0),ColorZone).AutoButtonColor = false diff --git a/public/asset/13 b/public/asset/13 index 4417d00..70042be 100644 --- a/public/asset/13 +++ b/public/asset/13 @@ -1,4 +1,4 @@ -%13% +%13% -- This script manages context switches in the backpack (Gear to Wardrobe, etc.) and player state changes. Also manages global functions across different tabs (currently only search) if game.CoreGui.Version < 7 then return end -- peace out if we aren't using the right client @@ -40,10 +40,10 @@ local closeButton = backpack.Tabs.CloseButton waitForChild(backpack.Tabs, "InventoryButton") local inventoryButton = backpack.Tabs.InventoryButton -if game.CoreGui.Version >= 8 then - waitForChild(backpack.Tabs, "WardrobeButton") - local wardrobeButton = backpack.Tabs.WardrobeButton -end + +waitForChild(backpack.Tabs, "WardrobeButton") +local wardrobeButton = backpack.Tabs.WardrobeButton + waitForChild(backpack.Parent,"ControlFrame") local backpackButton = waitForChild(backpack.Parent.ControlFrame,"BackpackButton") local currentTab = "gear" @@ -314,11 +314,9 @@ inventoryButton.MouseButton1Click:connect(function() newTabClicked("gear") end) inventoryButton.MouseEnter:connect(function() mouseOverTab(inventoryButton) end) inventoryButton.MouseLeave:connect(function() mouseLeaveTab(inventoryButton) end) -if game.CoreGui.Version >= 8 then - wardrobeButton.MouseButton1Click:connect(function() newTabClicked("wardrobe") end) - wardrobeButton.MouseEnter:connect(function() mouseOverTab(wardrobeButton) end) - wardrobeButton.MouseLeave:connect(function() mouseLeaveTab(wardrobeButton) end) -end +wardrobeButton.MouseButton1Click:connect(function() newTabClicked("wardrobe") end) +wardrobeButton.MouseEnter:connect(function() mouseOverTab(wardrobeButton) end) +wardrobeButton.MouseLeave:connect(function() mouseLeaveTab(wardrobeButton) end) closeButton.MouseButton1Click:connect(closeBackpack) diff --git a/public/asset/14 b/public/asset/14 index 2fca69e..93debd2 100644 --- a/public/asset/14 +++ b/public/asset/14 @@ -1,4 +1,4 @@ -%14& +%14% -- A couple of necessary functions local function waitForChild(instance, name) assert(instance) diff --git a/public/asset/15 b/public/asset/15 index fdff51b..229fb6e 100644 --- a/public/asset/15 +++ b/public/asset/15 @@ -1,4 +1,4 @@ -%15% +%15% if game.CoreGui.Version < 3 then return end -- peace out if we aren't using the right client -- A couple of necessary functions @@ -784,16 +784,12 @@ wait() -- let stuff initialize incase this is first heartbeat... waitForChild(player,"Backpack") waitForProperty(player,"Character") - --- not sure why this had no delay but the player.CharacterAdded one had one... this type of error would be easier to avoid with function reusage -delay(1,function() - local backpackChildren = player.Backpack:GetChildren() - local size = math.min(10,#backpackChildren) - for i = 1, size do - addingPlayerChild(backpackChildren[i],false) - end - setupBackpackListener() -end) +local backpackChildren = player.Backpack:GetChildren() +local size = math.min(10,#backpackChildren) +for i = 1, size do + addingPlayerChild(backpackChildren[i],false) +end +setupBackpackListener() waitForProperty(player,"Character") for i,v in ipairs(player.Character:GetChildren()) do