Add selectable startup world layouts

tests/inventory_storage_persistence_validation.gd

@@ -26,7 +26,10 @@ func _run() -> void:
 	var player := main.get("_player") as Player
 	assert(save_manager != null and player != null)
 	const TEST_WORLD_SEED := 918273
-	assert(save_manager.initialize_new_game(TEST_WORLD_SEED))
+	assert(save_manager.initialize_new_game(
+		TEST_WORLD_SEED,
+		WorldLayout.STARTER_ISLAND,
+	))
 	save_manager.set_autosave_enabled(true)
 	assert(player.bag.add_item(&"art_kit"))
 	assert(player.bag.add_item(&"coffee"))
@@ -44,6 +47,7 @@ func _run() -> void:
 	assert(bool(decoded.get("ok", false)))
 	var parsed: Dictionary = decoded["data"]
 	var records: Array = parsed["bag"]["items"]
+	assert(str(parsed["world"]["layout"]) == String(WorldLayout.STARTER_ISLAND))
 	assert(int(parsed["world"]["seed"]) == TEST_WORLD_SEED)
 	assert(_saved_slot(records, &"basic_fishing_rod") == 14)
 	assert(_saved_slot(records, &"coffee") == 12)
@@ -53,6 +57,7 @@ func _run() -> void:
 	player.unequip_bait()
 	player.unequip_lure()
 	assert(save_manager.load_player_data())
+	assert(save_manager.get_world_layout() == WorldLayout.STARTER_ISLAND)
 	assert(save_manager.get_world_seed() == TEST_WORLD_SEED)
 	assert(player.bag.get_storage_slot(&"basic_fishing_rod") == 14)
 	assert(player.bag.get_storage_slot(&"coffee") == 12)

tests/world_layout_multiplayer_validation.gd

@@ -0,0 +1,126 @@
+extends SceneTree
+
+const MainScene: PackedScene = preload("res://main/main.tscn")
+const TEST_PORT: int = 18155
+const TEST_SEED: int = 86421357
+
+
+func _initialize() -> void:
+	call_deferred("_run")
+
+
+func _run() -> void:
+	var arguments: PackedStringArray = OS.get_cmdline_user_args()
+	if arguments.has("host"):
+		await _run_host()
+		return
+	if arguments.has("client"):
+		await _run_client()
+		return
+	push_error("World layout multiplayer validation needs host or client mode.")
+	quit(1)
+
+
+func _run_host() -> void:
+	var main: Node = await _create_initialized_main()
+	var session := main.get_node("%NetworkSession") as NetworkSession
+	var save_manager := main.get("_save_manager") as PlayerSaveManager
+	assert(bool(main.call(
+		"_apply_world",
+		WorldLayout.STARTER_ISLAND,
+		TEST_SEED,
+		true,
+	)))
+	assert(bool(main.call(
+		"_prepare_host_world",
+		WorldLayout.STARTER_ISLAND,
+		TEST_SEED,
+	)))
+	assert(save_manager.initialize_new_game(
+		TEST_SEED,
+		WorldLayout.STARTER_ISLAND,
+	))
+	assert(session.start_private_host(TEST_PORT))
+	main.call("_enter_gameplay")
+	assert(session.set_host_open(true))
+	var remote_peer_id: int = await _wait_for_remote_peer(session)
+	assert(remote_peer_id > 1)
+	assert(session.peer_supports_capability(
+		remote_peer_id,
+		NetworkProtocol.WORLD_LAYOUT_CAPABILITY,
+	))
+	var disconnect_deadline: int = Time.get_ticks_msec() + 12000
+	while (
+		Time.get_ticks_msec() < disconnect_deadline
+		and session.is_authenticated_peer(remote_peer_id)
+	):
+		await process_frame
+	assert(not session.is_authenticated_peer(remote_peer_id))
+	print("World layout multiplayer host validation: PASS")
+	await _cleanup(main, session)
+
+
+func _run_client() -> void:
+	var main: Node = await _create_initialized_main()
+	main.call(
+		"_on_title_join_game_requested",
+		"127.0.0.1:%d" % TEST_PORT,
+	)
+	var session := main.get_node("%NetworkSession") as NetworkSession
+	var deadline: int = Time.get_ticks_msec() + 20000
+	while Time.get_ticks_msec() < deadline:
+		await process_frame
+		if session.state == NetworkSession.State.VERIFYING_SERVER_IDENTITY:
+			main.call("_confirm_server_trust")
+		if session.is_joined_client() and bool(main.get("_gameplay_started")):
+			break
+	assert(session.is_joined_client())
+	assert(session.supports_server_capability(
+		NetworkProtocol.WORLD_LAYOUT_CAPABILITY
+	))
+	var metadata: Dictionary = session.get_last_server_metadata()
+	assert(str(metadata.get("world_layout", "")) == String(
+		WorldLayout.STARTER_ISLAND
+	))
+	assert(int(metadata.get("world_seed", 0)) == TEST_SEED)
+	var world := main.get("_test_world") as TestWorld
+	assert(world.get_world_layout() == WorldLayout.STARTER_ISLAND)
+	assert(world.get_generation_seed() == TEST_SEED)
+	assert(world.get_node_or_null("Regions/StarterIslandRegion") != null)
+	assert(world.get_fishing_shop() != null)
+	assert(world.get_player_storage() != null)
+	print("World layout multiplayer client validation: PASS")
+	await _cleanup(main, session)
+
+
+func _create_initialized_main() -> Node:
+	root.size = Vector2i(1280, 720)
+	var main: Node = MainScene.instantiate()
+	root.add_child(main)
+	for _frame: int in 4:
+		await process_frame
+	if not bool(main.get("_application_initialized")):
+		main.call("_activate_selected_data_path", "", true)
+	for _frame: int in 8:
+		await process_frame
+	assert(bool(main.get("_application_initialized")))
+	return main
+
+
+func _wait_for_remote_peer(session: NetworkSession) -> int:
+	var deadline: int = Time.get_ticks_msec() + 20000
+	while Time.get_ticks_msec() < deadline:
+		await process_frame
+		for peer_id: int in session.get_authenticated_peer_ids():
+			if peer_id != session.get_local_peer_id():
+				return peer_id
+	return 0
+
+
+func _cleanup(main: Node, session: NetworkSession) -> void:
+	session.disconnect_session("")
+	main.queue_free()
+	for _frame: int in 4:
+		await process_frame
+	await create_timer(0.1).timeout
+	quit()

tests/world_layout_multiplayer_validation.gd.uid

@@ -0,0 +1 @@
+uid://bg52pbgv5ykjc

tests/world_layout_validation.gd

@@ -0,0 +1,125 @@
+extends SceneTree
+
+const TestWorldScene: PackedScene = preload("res://world/test_world.tscn")
+const SetupPageScene: PackedScene = preload(
+	"res://ui/new_game_setup_page.tscn"
+)
+
+
+func _initialize() -> void:
+	call_deferred("_run")
+
+
+func _run() -> void:
+	root.size = Vector2i(1280, 720)
+	_validate_layout_values()
+	await _validate_setup_page()
+	await _validate_world_switching()
+	_validate_network_metadata()
+	print("World layout validation: PASS")
+	quit()
+
+
+func _validate_layout_values() -> void:
+	assert(WorldLayout.is_valid(WorldLayout.GENERATED))
+	assert(WorldLayout.is_valid(String(WorldLayout.STARTER_ISLAND)))
+	assert(not WorldLayout.is_valid(&"unknown"))
+	assert(WorldLayout.normalized("unknown") == WorldLayout.GENERATED)
+	assert(WorldLayout.display_name(WorldLayout.STARTER_ISLAND) == "starter island")
+
+
+func _validate_setup_page() -> void:
+	assert(NewGameSetupPage.parse_seed_text(" 24680 ") == 24680)
+	assert(NewGameSetupPage.parse_seed_text("0") == 0)
+	assert(NewGameSetupPage.parse_seed_text("2147483647") == 0)
+	assert(NewGameSetupPage.parse_seed_text("") == 0)
+	var text_seed: int = NewGameSetupPage.parse_seed_text("voyager island")
+	assert(text_seed > 0 and text_seed <= PlayerSaveManager.MAX_WORLD_SEED)
+	assert(NewGameSetupPage.parse_seed_text(" voyager island ") == text_seed)
+	assert(NewGameSetupPage.parse_seed_text("voyager island") == text_seed)
+	assert(NewGameSetupPage.parse_seed_text("Voyager Island") != text_seed)
+	var page := SetupPageScene.instantiate() as NewGameSetupPage
+	root.add_child(page)
+	await process_frame
+	page.open_page(true)
+	await process_frame
+	assert(page.visible)
+	var paper := page.get_node("%Paper") as PanelContainer
+	assert(paper.get_combined_minimum_size().x <= paper.size.x)
+	assert(paper.get_combined_minimum_size().y <= paper.size.y)
+	assert(page.get_selected_world_layout() == WorldLayout.GENERATED)
+	assert(page.get_selected_world_seed() > 0)
+	assert((page.get_node("%OverwriteWarning") as Label).visible)
+	var generated_button := page.get_node("%GeneratedButton") as Button
+	var starter_button := page.get_node("%StarterButton") as Button
+	var random_button := page.get_node("%RandomSeedButton") as Button
+	var custom_button := page.get_node("%CustomSeedButton") as Button
+	var seed_edit := page.get_node("%SeedEdit") as LineEdit
+	var start_button := page.get_node("%StartButton") as Button
+	var back_button := page.get_node("%BackButton") as Button
+	assert(generated_button.get_node(generated_button.focus_neighbor_right) == starter_button)
+	assert(generated_button.get_node(generated_button.focus_neighbor_bottom) == random_button)
+	assert(random_button.get_node(random_button.focus_neighbor_right) == custom_button)
+	assert(start_button.get_node(start_button.focus_neighbor_right) == back_button)
+	page.call("_choose_custom_seed")
+	assert(seed_edit.editable)
+	assert(custom_button.get_node(custom_button.focus_neighbor_bottom) == seed_edit)
+	assert(seed_edit.get_node(seed_edit.focus_neighbor_bottom) == start_button)
+	page.call("_set_world_layout", WorldLayout.STARTER_ISLAND)
+	assert(not (page.get_node("%SeedSection") as Control).visible)
+	var request: Dictionary = {}
+	page.start_requested.connect(func(layout: StringName, seed: int) -> void:
+		request["layout"] = layout
+		request["seed"] = seed
+	)
+	page.call("_request_start")
+	assert(request.get("layout") == WorldLayout.STARTER_ISLAND)
+	assert(int(request.get("seed", 0)) > 0)
+	page.queue_free()
+	await process_frame
+
+
+func _validate_world_switching() -> void:
+	var world := TestWorldScene.instantiate() as TestWorld
+	root.add_child(world)
+	await process_frame
+	assert(world.get_world_layout() == WorldLayout.GENERATED)
+	assert(world.get_fishing_shop() != null)
+	assert(world.get_player_storage() != null)
+	assert(world.activate_world(WorldLayout.STARTER_ISLAND, 13579))
+	assert(world.get_world_layout() == WorldLayout.STARTER_ISLAND)
+	assert(world.get_generation_seed() == 13579)
+	assert(world.get_node_or_null("Regions/StarterIslandRegion") != null)
+	assert(world.get_node_or_null("Regions/GeneratedWorldRegion") == null)
+	assert(world.get_fishing_shop() != null)
+	assert(world.get_player_storage() != null)
+	assert(not world.get_fishable_water_regions().is_empty())
+	assert(world.activate_world(WorldLayout.GENERATED, 24680))
+	assert(world.get_world_layout() == WorldLayout.GENERATED)
+	assert(world.get_generation_seed() == 24680)
+	assert(world.get_node_or_null("Regions/GeneratedWorldRegion") != null)
+	assert(world.get_node_or_null("Regions/StarterIslandRegion") == null)
+	world.queue_free()
+	await process_frame
+
+
+func _validate_network_metadata() -> void:
+	var hello: Dictionary = NetworkProtocol.make_server_hello(
+		true,
+		NetworkProtocol.RejectionCode.NONE,
+		"session",
+		2,
+		1,
+		16,
+		"room",
+		97531,
+		WorldLayout.STARTER_ISLAND,
+	)
+	assert(str(hello.get("world_layout", "")) == String(
+		WorldLayout.STARTER_ISLAND
+	))
+	assert(int(hello.get("world_seed", 0)) == 97531)
+	assert(
+		NetworkProtocol.WORLD_LAYOUT_CAPABILITY
+		in PackedStringArray(hello.get("capability_flags", []))
+	)

tests/world_layout_validation.gd.uid

@@ -0,0 +1 @@
+uid://bgxgyqq73sdpi