x

cubzh.lua

@@ -24,6 +24,21 @@ easy_onboarding.startOnboarding = function(self, config)
 	stopCallbackData = steps[1].start(self, currentStep)
 end
 
+easy_onboarding.createTextStep = function(_, str)
+	local ui = require("uikit")
+	local node = ui:createFrame(Color(0, 0, 0, 0.5))
+	local text = ui:createText(str, Color.White)
+	text:setParent(node)
+	node.parentDidResize = function()
+		node.Width = text.Width + text.Height
+		node.Height = text.Height * 2
+		text.pos = { node.Width * 0.5 - text.Width * 0.5, node.Height * 0.5 - text.Height * 0.5 }
+		node.pos = { Screen.Width * 0.5 - node.Width * 0.5, Screen.Height * 0.2 - node.Height * 0.5 }
+	end
+	node:parentDidResize()
+	return node
+end
+
 easy_onboarding.next = function(self)
 	if not steps[currentStep] then
 		return
@@ -39,29 +54,15 @@ end
 local onboardingConfig = {
 	steps = {
 		{
-			start = function(onboarding, step)
-				local ui = require("uikit")
+			start = function(onboarding)
 				local data = {}
-				data.ui = ui:createFrame(Color(0, 0, 0, 0.5))
-				local text = ui:createText("1/3 - Hold click and drag to move the camera.", Color.White)
-				text:setParent(data.ui)
-				data.ui.parentDidResize = function()
-					data.ui.Width = text.Width + text.Height
-					data.ui.Height = text.Height * 2
-					text.pos = { data.ui.Width * 0.5 - text.Width * 0.5, data.ui.Height * 0.5 - text.Height * 0.5 }
-					data.ui.pos =
-						{ Screen.Width * 0.5 - data.ui.Width * 0.5, Screen.Height * 0.2 - data.ui.Height * 0.5 }
-				end
-				data.ui:parentDidResize()
-
+				data.ui = onboarding:createTextStep("1/3 - Hold click and drag to move the camera.")
 				data.listener = LocalEvent:Listen(LocalEvent.Name.PointerDrag, function()
 					Timer(1, function()
-						print("next")
 						onboarding:next()
 					end)
 					data.listener:Remove()
 				end)
-
 				return data
 			end,
 			stop = function(_, data)
@@ -69,21 +70,9 @@ local onboardingConfig = {
 			end,
 		},
 		{
-			start = function(onboarding, step)
-				local ui = require("uikit")
+			start = function(onboarding)
 				local data = {}
-				data.ui = ui:createFrame(Color(0, 0, 0, 0.5))
-				local text = ui:createText("2/3 - Use WASD/ZQSD to move", Color.White)
-				text:setParent(data.ui)
-				data.ui.parentDidResize = function()
-					data.ui.Width = text.Width + text.Height
-					data.ui.Height = text.Height * 2
-					text.pos = { data.ui.Width * 0.5 - text.Width * 0.5, data.ui.Height * 0.5 - text.Height * 0.5 }
-					data.ui.pos =
-						{ Screen.Width * 0.5 - data.ui.Width * 0.5, Screen.Height * 0.2 - data.ui.Height * 0.5 }
-				end
-				data.ui:parentDidResize()
-
+				data.ui = onboarding:createTextStep("2/3 - Use WASD/ZQSD to move")
 				data.listener = LocalEvent:Listen(LocalEvent.Name.KeyboardInput, function()
 					Timer(1, function()
 						onboarding:next()
@@ -98,31 +87,12 @@ local onboardingConfig = {
 			end,
 		},
 		{
-			start = function(onboarding, step)
-				local ui = require("uikit")
+			start = function(onboarding)
 				local data = {}
-				data.ui = ui:createFrame(Color(0, 0, 0, 0.5))
-				local text = ui:createText("3/3 - Press Enter in front of a NPC to chat", Color.White)
-				text:setParent(data.ui)
-				data.ui.parentDidResize = function()
-					data.ui.Width = text.Width + text.Height
-					data.ui.Height = text.Height * 2
-					text.pos = { data.ui.Width * 0.5 - text.Width * 0.5, data.ui.Height * 0.5 - text.Height * 0.5 }
-					data.ui.pos =
-						{ Screen.Width * 0.5 - data.ui.Width * 0.5, Screen.Height * 0.2 - data.ui.Height * 0.5 }
-				end
-				data.ui:parentDidResize()
-
-				data.listener = LocalEvent:Listen(LocalEvent.Name.KeyboardInput, function(_, keycode, _, down)
-					if keycode == require("inputcodes").RETURN then
-						print("triggered")
-						Timer(1, function()
-							onboarding:next()
-						end)
-						data.listener:Remove()
-					end
-				end, { topPriority = true })
-
+				data.ui = onboarding:createTextStep("3/3 - Press Enter in front of a NPC to chat")
+				Timer(10, function()
+					onboarding:next()
+				end)
 				return data
 			end,
 			stop = function(_, data)