x

cubzh.lua

@@ -721,23 +721,26 @@ 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
@@ -780,7 +783,7 @@ Client.OnStart = function()
 	pathfinding:createPathfindingMap()
 
 	gigax:setConfig(gigaxWorldConfig)
-	print(math.random(20))
+
 	local randomNames = { "aduermael", "soliton", "gdevillele", "caillef", "voxels", "petroglyph" }
 	Player.Avatar:load({ usernameOrId = randomNames[math.random(#randomNames)] })
 end