x

cubzh.lua

@@ -27,6 +27,9 @@ end
 easy_onboarding.next = function(self)
 	steps[currentStep].stop(self, stopCallbackData)
 	currentStep = currentStep + 1
+	if not steps[currentStep] then
+		return
+	end
 	stopCallbackData = steps[currentStep].start(self, currentStep)
 end
 
@@ -515,7 +518,7 @@ local skills = {
 				print("Can't find npc")
 				return
 			end
-			dialog:create(action.content, npc.avatar)
+			dialog:create(action.content, npc.avatar.Head)
 			print(string.format("%s: %s", npc.name, action.content))
 		end,
 		action_format_str = "{protagonist_name} said '{content}' to {target_name}",
@@ -532,13 +535,13 @@ local skills = {
 				return
 			end
 			local npc = client:getNpc(action.character_id)
-			dialog:create("I'm going to " .. targetName, npc.avatar)
+			dialog:create("I'm going to " .. targetName, npc.avatar.Head)
 			print(string.format("%s: %s", npc.name, "I'm going to " .. targetName))
 			local origin = Map:WorldToBlock(npc.object.Position)
 			local destination = Map:WorldToBlock(targetPosition) + Number3(math.random(-1, 1), 0, math.random(-1, 1))
 			local canMove = pathfinding:moveObjectTo(npc.object, origin, destination)
 			if not canMove then
-				dialog:create("I can't go there", npc.avatar)
+				dialog:create("I can't go there", npc.avatar.Head)
 				return
 			end
 		end,
@@ -555,7 +558,7 @@ local skills = {
 				return
 			end
 
-			dialog:create("<Greets you warmly!>", npc.avatar)
+			dialog:create("<Greets you warmly!>", npc.avatar.Head)
 			print(string.format("%s: %s", npc.name, "<Greets you warmly!>"))
 
 			npc.avatar.Animations.SwingRight:Play()
@@ -573,7 +576,7 @@ local skills = {
 				return
 			end
 
-			dialog:create("<Jumps in the air!>", npc.avatar)
+			dialog:create("<Jumps in the air!>", npc.avatar.Head)
 			print(string.format("%s: %s", npc.name, "<Jumps in the air!>"))
 
 			npc.object.avatarContainer.Physics = PhysicsMode.Dynamic
@@ -595,7 +598,7 @@ local skills = {
 				return
 			end
 
-			dialog:create("I'm following you", npc.avatar)
+			dialog:create("I'm following you", npc.avatar.Head)
 			print(string.format("%s: %s", npc.name, "I'm following you"))
 
 			followHandler = pathfinding:followObject(npc.object, Player)
@@ -620,11 +623,11 @@ local skills = {
 			end
 
 			require("explode"):shapes(npc.avatar)
-			dialog:create("*boom*", npc.avatar)
+			dialog:create("*boom*", npc.avatar.Head)
 			--print(string.format("%s: %s", npc.name, "EXPLODING"))
 			npc.avatar.IsHidden = true
 			Timer(5, function()
-				dialog:create("Aaaaand... I'm back!", npc.avatar)
+				dialog:create("Aaaaand... I'm back!", npc.avatar.Head)
 				npc.avatar.IsHidden = false
 			end)
 		end,
@@ -643,7 +646,7 @@ local skills = {
 			shape.Scale = 4
 			Player:EquipRightHand(shape)
 
-			dialog:create("Here is an apple for you!", npc.avatar)
+			dialog:create("Here is an apple for you!", npc.avatar.Head)
         end,
 		action_format_str = "{protagonist_name} gave you a piece of bread!"
     },
@@ -656,7 +659,7 @@ local skills = {
 			if not npc then print("Can't find npc") return end
 
 			npc.object.Scale = npc.object.Scale * 2
-			dialog:create("I am taller than you now!", npc.avatar)
+			dialog:create("I am taller than you now!", npc.avatar.Head)
         end,
 		action_format_str = "{protagonist_name} doubled his height!"
     },--]]
@@ -677,7 +680,7 @@ local skills = {
 				end)
 				Player:EquipHat(obj)
 			end)
-			dialog:create("Let's get the party started!", npc.avatar)
+			dialog:create("Let's get the party started!", npc.avatar.Head)
 		end,
 		action_format_str = "{protagonist_name} gave you a piece of bread!",
 	},
@@ -693,7 +696,7 @@ local skills = {
 			end
 
 			local squirrel = spawnSquirrelAbovePlayer(Player)
-			dialog:create("Wooh, squirrel!", npc.avatar)
+			dialog:create("Wooh, squirrel!", npc.avatar.Head)
 			-- make it disappear after a while
 			Timer(5, function()
 				squirrel:RemoveFromParent()