caillef-pr (#2)

- update (3e666d453e399d8c31a3ddbf1ca3e3b8c646592c)
- update (6d004c6b053ee01394ff2771bcf67fe7d2619c8b)
- update (fea20a4cecb2fcf89ef6cddb1170a223ec7e9363)
- update (31396ec9eea701b5ecb71a0415ae771c8a91bd4c)
- update (04f22bca6fee470f1620377ae9692904cf019723)
- update (5a5f18ffe726eeddc6b84a7468662ab3229003c6)
- update (a1f3a9a627b5d5c8062dc8a4192717f0b2606514)
- update (3052ab31e45ae1cc3cf84bcc5c331bde1f6fb23b)
- update (d84e910e6219cbf50333c7cc9bc2afd5941e8caf)
- update (89d3cd657caec6dc1d2f628fbecbfc00c3f7bae1)
- update (836dc0796fa8b0b0ad191baf6c11548f0bddb6a0)
- update (c0cc77a32183cdca9cef1bf3d81d683d9ca3c285)
- update (22a9b1b55ba0ff470db8c297e74d1daf759a1a31)
- x (ff0d35a294c2021c359614dc7dd526a8932ab689)
- x (6b8a11d2017ba28ad16018ea4702ecbf99a74be3)
- x (5b12f63a0657a023439cd84a749945e3fd4ee887)
- x (3d3b96f6d595c9dfeef5148d39a98d1fc62fac9e)
- x (664a01fd3eaabcecf59e17169a831c4a54c4af34)
- x (ffe6eaec105e922a48d2cbf44416519ffcef1da9)
- x (f29f54dc072f70cd8b3aefc08ebea59a781e9cc2)
- x (f2816ad32ec59b9a7835578929d3201ce089a04b)
- x (dc115438c575a1bd3b014263a82f29a564bdf7ab)
- x (5589a688c51a1ad699f985146c02ceb9346ed264)
- x (0932888a263884c1be24ccd72c6aef122522b26b)
- x (d0e9bce1897948cf69f3536668d393676bfda438)
- x (5e445136a6dd114d7c09bfeb640175f4216f286b)
- x (a7eab3dcd5218290afb2baa8f8f70390977a4c4f)
- x (c057fe66cd16864bf8de14706ad2643f4c50b866)
- x (755941fa227e755cf4651e498518574b1417cbe4)
- x (b064e25c653af9591a8c9cba271ebbdc3a09d699)
- x (d9c9227bbe5b7a10e682d63327163731c1838a97)
- x (e14d52f10e0366f9dbf8fb7dce1cbf88f2511540)

cubzh.lua

@@ -1,9 +1,10 @@
 math.randomseed(math.floor(Time.UnixMilli() % 100000))
 
 Modules = {
-	gigax = "github.com/GigaxGames/integrations/cubzh:5025b99",
-	pathfinding = "github.com/caillef/cubzh-library/pathfinding:f8c4315",
+	gigax = "github.com/GigaxGames/integrations/cubzh:9a71b9f",
+	pathfinding = "github.com/caillef/cubzh-library/pathfinding:5f9c6bd",
 	floating_island_generator = "github.com/caillef/cubzh-library/floating_island_generator:82d22a5",
+	easy_onboarding = "github.com/caillef/cubzh-library/easy_onboarding:77728ee",
 }
 
 Config = {
@@ -29,8 +30,6 @@ end
 local SIMULATION_NAME = "Islands" .. tostring(math.random())
 local SIMULATION_DESCRIPTION = "Three floating islands."
 
-local occupiedPositions = {}
-
 local skills = {
 	{
 		name = "SAY",
@@ -42,8 +41,8 @@ local skills = {
 				print("Can't find npc")
 				return
 			end
-			dialog:create(action.content, npc.avatar)
-			print(string.format("%s: %s", npc.name, action.content))
+			dialog:create(action.content, npc.avatar.Head)
+			print(string.format("%s: %s", npc.gameName, action.content))
 		end,
 		action_format_str = "{protagonist_name} said '{content}' to {target_name}",
 	},
@@ -59,13 +58,13 @@ local skills = {
 				return
 			end
 			local npc = client:getNpc(action.character_id)
-			dialog:create("I'm going to " .. targetName, npc.avatar)
-			print(string.format("%s: %s", npc.name, "I'm going to " .. targetName))
+			dialog:create("I'm going to " .. targetName, npc.avatar.Head)
+			print(string.format("%s: %s", npc.gameName, "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,
@@ -82,8 +81,8 @@ local skills = {
 				return
 			end
 
-			dialog:create("<Greets you warmly!>", npc.avatar)
-			print(string.format("%s: %s", npc.name, "<Greets you warmly!>"))
+			dialog:create("<Greets you warmly!>", npc.avatar.Head)
+			print(string.format("%s: %s", npc.gameName, "<Greets you warmly!>"))
 
 			npc.avatar.Animations.SwingRight:Play()
 		end,
@@ -100,8 +99,8 @@ local skills = {
 				return
 			end
 
-			dialog:create("<Jumps in the air!>", npc.avatar)
-			print(string.format("%s: %s", npc.name, "<Jumps in the air!>"))
+			dialog:create("<Jumps in the air!>", npc.avatar.Head)
+			print(string.format("%s: %s", npc.gameName, "<Jumps in the air!>"))
 
 			npc.object.avatarContainer.Physics = PhysicsMode.Dynamic
 			npc.object.avatarContainer.Velocity.Y = 50
@@ -122,8 +121,8 @@ local skills = {
 				return
 			end
 
-			dialog:create("I'm following you", npc.avatar)
-			print(string.format("%s: %s", npc.name, "I'm following you"))
+			dialog:create("I'm following you", npc.avatar.Head)
+			print(string.format("%s: %s", npc.gameName, "I'm following you"))
 
 			followHandler = pathfinding:followObject(npc.object, Player)
 			return {
@@ -147,11 +146,10 @@ local skills = {
 			end
 
 			require("explode"):shapes(npc.avatar)
-			dialog:create("*boom*", npc.avatar)
-			--print(string.format("%s: %s", npc.name, "EXPLODING"))
+			dialog:create("*boom*", npc.avatar.Head)
 			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,
@@ -170,7 +168,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!"
     },
@@ -183,7 +181,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!"
     },--]]
@@ -199,12 +197,12 @@ local skills = {
 			end
 
 			Object:Load("claire.party_hat", function(obj)
-				require("hierarchyactions"):apply(obj, { includeRoot = true }, function(o)
+				require("hierarchyactions"):applyToDescendants(obj, { includeRoot = true }, function(o)
 					o.Physics = PhysicsMode.Disabled
 				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!",
 	},
@@ -220,7 +218,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()
@@ -253,6 +251,7 @@ local locations = {
 local NPCs = {
 	{
 		name = "npcscientist",
+		gameName = "Scientist",
 		physicalDescription = "Short, with a stern expression and sharp eyes",
 		psychologicalProfile = "Grumpy but insightful, suspicious yet intelligent",
 		currentLocationName = "Scientist Island",
@@ -265,6 +264,7 @@ local NPCs = {
 	},
 	{
 		name = "npcbaker",
+		gameName = "Baker",
 		physicalDescription = "Tall, with a solemn demeanor and thoughtful eyes",
 		psychologicalProfile = "Wise and mysterious, calm under pressure",
 		currentLocationName = "Baker Island",
@@ -277,6 +277,7 @@ local NPCs = {
 	},
 	{
 		name = "npcpirate",
+		gameName = "Pirate",
 		physicalDescription = "Average height, with bright green eyes and a warm smile",
 		psychologicalProfile = "Friendly and helpful, quick-witted and resourceful",
 		currentLocationName = "Pirate Island",
@@ -309,28 +310,33 @@ Client.OnWorldObjectLoad = function(obj)
 	if obj.Name == "pirate_ship" then
 		obj.Scale = 1
 	end
-	if obj.Name == "NPC_scientist" then
-		local pos = obj.Position:Copy()
-		gigaxWorldConfig.locations[1].position = pos
-		gigaxWorldConfig.NPCs[1].position = pos
-		gigaxWorldConfig.NPCs[1].rotation = obj.Rotation:Copy()
-		obj:RemoveFromParent()
-	elseif obj.Name == "NPC_baker" then
-		local pos = obj.Position:Copy()
-		gigaxWorldConfig.locations[2].position = pos
-		gigaxWorldConfig.NPCs[2].position = pos
-		gigaxWorldConfig.NPCs[2].rotation = obj.Rotation:Copy()
-		obj:RemoveFromParent()
-	elseif obj.Name == "NPC_pirate" then
+
+	local locationsIndexByName = {}
+	for k, v in ipairs(gigaxWorldConfig.locations) do
+		locationsIndexByName[v.name] = k
+	end
+	local npcIndexByName = {
+		NPC_scientist = 1,
+		NPC_baker = 2,
+		NPC_pirate = 3,
+	}
+
+	local index = npcIndexByName[obj.Name]
+	if index then
 		local pos = obj.Position:Copy()
-		gigaxWorldConfig.locations[3].position = pos
-		gigaxWorldConfig.NPCs[3].position = pos
-		gigaxWorldConfig.NPCs[3].rotation = obj.Rotation:Copy()
+		gigaxWorldConfig.NPCs[index].position = pos
+		gigaxWorldConfig.NPCs[index].rotation = obj.Rotation:Copy()
+
+		local locationName = gigaxWorldConfig.NPCs[index].currentLocationName
+		local locationIndex = locationsIndexByName[locationName]
+		gigaxWorldConfig.locations[locationIndex].position = pos
 		obj:RemoveFromParent()
 	end
 end
 
 Client.OnStart = function()
+	easy_onboarding:startOnboarding(onboardingConfig)
+
 	require("object_skills").addStepClimbing(Player, {
 		mapScale = MAP_SCALE,
 		collisionGroups = Map.CollisionGroups,
@@ -367,7 +373,8 @@ Client.OnStart = function()
 
 	gigax:setConfig(gigaxWorldConfig)
 
-	Player.Avatar:load({ usernameOrId = "aduermael" })
+	local randomNames = { "aduermael", "soliton", "gdevillele", "caillef", "voxels", "petroglyph" }
+	Player.Avatar:load({ usernameOrId = randomNames[math.random(#randomNames)] })
 end
 
 Client.Action1 = function()
@@ -406,6 +413,57 @@ Client.OnChat = function(payload)
 		content = msg,
 	})
 
-	print(payload.message)
+	print("User: " .. payload.message)
 	return true
 end
+
+onboardingConfig = {
+	steps = {
+		{
+			start = function(onboarding)
+				local data = {}
+				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()
+						onboarding:next()
+					end)
+					data.listener:Remove()
+				end)
+				return data
+			end,
+			stop = function(_, data)
+				data.ui:remove()
+			end,
+		},
+		{
+			start = function(onboarding)
+				local data = {}
+				data.ui = onboarding:createTextStep("2/3 - Use WASD/ZQSD to move.")
+				data.listener = LocalEvent:Listen(LocalEvent.Name.KeyboardInput, function()
+					Timer(1, function()
+						onboarding:next()
+					end)
+					data.listener:Remove()
+				end)
+
+				return data
+			end,
+			stop = function(_, data)
+				data.ui:remove()
+			end,
+		},
+		{
+			start = function(onboarding)
+				local data = {}
+				data.ui = onboarding:createTextStep("3/3 - Press Enter in front of the Pirate to chat.")
+				Timer(10, function()
+					onboarding:next()
+				end)
+				return data
+			end,
+			stop = function(_, data)
+				data.ui:remove()
+			end,
+		},
+	},
+}