CLI-3017 Mobile Jump Button Should Disappear If Jumping Disabled (#558)

* touch jump changes

made MasterControl:GetHumanoid public, and used this in TouchJump to get
the humanoid. When the JumpPower property changes,  if it's less than 1,
it hides the button, if its greater, it'll display it.

* Added check for default disabled jump

In the case the jump power is set before jump button initializes i added
this check.

* should work on respawn, and some other changes

I reworked some of the code to make it more organized, buttons state
changing should work on respawn, and made it so if the jump button gets
disabled externally, it knows better than to reenable it without
checking that first.

Author: garnold24

PlayerScripts/PlayerScriptsPlace/StarterPlayer/StarterPlayerScripts/ControlScript/MasterControl.rbxmx

@@ -35,8 +35,9 @@ local isSeated = false
 local myVehicleSeat = nil
 local moveValue = Vector3.new(0,0,0)
 
+
 --[[ Local Functions ]]--
-local function getHumanoid()
+function MasterControl:GetHumanoid()
 	local character = LocalPlayer and LocalPlayer.Character
 	if character then
 		if CachedHumanoid and CachedHumanoid.Parent == character then
@@ -58,7 +59,7 @@ function MasterControl:Init()
 
 	local renderStepFunc = function()
 		if LocalPlayer and LocalPlayer.Character then
-			local humanoid = getHumanoid()
+			local humanoid = self:GetHumanoid()
 			if not humanoid then return end
 
 			if humanoid and not humanoid.PlatformStand and isJumping then
@@ -74,6 +75,8 @@ function MasterControl:Init()
 			end
 
 			moveFunc(LocalPlayer, adjustedMoveValue, true)	
+			
+			
 		end
 	end
 
@@ -111,7 +114,7 @@ function MasterControl:SetIsJumping(jumping)
 end
 
 function MasterControl:DoJump()
-	local humanoid = getHumanoid()
+	local humanoid = self:GetHumanoid()
 	if humanoid then
 		humanoid.Jump = true
 	end

PlayerScripts/PlayerScriptsPlace/StarterPlayer/StarterPlayerScripts/ControlScript/MasterControl/TouchJump.rbxmx

@@ -26,20 +26,53 @@ while not Players.LocalPlayer do
 	wait()
 end
 local LocalPlayer = Players.LocalPlayer
+local Humanoid = MasterControl:GetHumanoid()
 local JumpButton = nil
 local OnInputEnded = nil		-- defined in Create()
+local HumChangeConnection = nil
+local ExternallyEnabled = false --[[I don't think there's anything that disables jump from outside this script, but in case that ever happens, 
+							we don't want to re-enable it when jump power is changed]]
 
 --[[ Constants ]]--
 local TOUCH_CONTROL_SHEET = "rbxasset://textures/ui/TouchControlsSheet.png"
 
+--[[ Private Functions ]]--
+local function humanoidChanged(prop)
+	if prop == "JumpPower" then
+		if Humanoid.JumpPower == 0 then
+			TouchJump:Disable()
+		elseif Humanoid.JumpPower > 0 then
+			TouchJump:Enable()
+		end
+	elseif prop == "Parent" then
+		if not Humanoid.Parent then
+			HumChangeConnection:disconnect()
+		end
+	end
+end
+
+local function disableButton()
+	JumpButton.Visible = false
+	OnInputEnded()
+end
+
+local function enableButton()
+	if Humanoid and ExternallyEnabled then
+		if Humanoid.JumpPower > 0 then
+			JumpButton.Visible = true
+		end
+	end
+end
+
 --[[ Public API ]]--
 function TouchJump:Enable()
-	JumpButton.Visible = true
+	ExternallyEnabled = true
+	enableButton()
 end
 
 function TouchJump:Disable()
-	JumpButton.Visible = false
-	OnInputEnded()
+	ExternallyEnabled = false
+	disableButton()
 end
 
 function TouchJump:Create(parentFrame)
@@ -97,9 +130,25 @@ function TouchJump:Create(parentFrame)
 		end
 	end)
 
+	if Humanoid then
+		HumChangeConnection = Humanoid.Changed:connect(humanoidChanged)
+	end
 	JumpButton.Parent = parentFrame
 end
 
+LocalPlayer.CharacterAdded:connect(function(newCharacter)
+	if HumChangeConnection then
+		HumChangeConnection:disconnect()
+	end
+	-- rebind event to new Humanoid
+	Humanoid = nil
+	repeat
+		Humanoid = MasterControl:GetHumanoid()
+		wait()
+	until Humanoid and Humanoid.Parent == newCharacter
+	HumChangeConnection = Humanoid.Changed:connect(humanoidChanged)
+end)
+
 return TouchJump
 ]]></ProtectedString>
 		</Properties>