Fix build stamp visibility, add create world UI, and add Save as New World to editor
checkpoint / checkpoint (push) Successful in 5m54s
checkpoint / checkpoint (push) Successful in 5m54s
This commit is contained in:
+170
-3
@@ -12,6 +12,7 @@ extends Control
|
||||
@onready var error_label: Label = $VBoxContainer/ErrorLabel
|
||||
@onready var refresh_button: Button = $VBoxContainer/HeaderHBox/RefreshButton
|
||||
@onready var back_button: Button = $VBoxContainer/HeaderHBox/BackButton
|
||||
@onready var create_button: Button = $VBoxContainer/HeaderHBox/CreateButton
|
||||
@onready var empty_label: Label = $VBoxContainer/EmptyLabel
|
||||
|
||||
## Cached so each world card can decide whether to show "Edit World"
|
||||
@@ -20,16 +21,20 @@ extends Control
|
||||
## round trip per card. -1 until resolved / on failure, in which case no
|
||||
## card shows the edit entry point.
|
||||
var _current_user_id: int = -1
|
||||
var _create_modal: Control = null
|
||||
|
||||
|
||||
func _ready() -> void:
|
||||
refresh_button.disabled = false
|
||||
back_button.disabled = false
|
||||
create_button.disabled = false
|
||||
loading_label.visible = false
|
||||
error_label.visible = false
|
||||
empty_label.visible = false
|
||||
world_list.visible = false
|
||||
|
||||
_show_build_stamp()
|
||||
|
||||
var me_result: Dictionary = await ApiClient.get_me()
|
||||
if me_result.ok and me_result.data is Dictionary:
|
||||
_current_user_id = int((me_result.data as Dictionary).get("id", -1))
|
||||
@@ -37,6 +42,157 @@ func _ready() -> void:
|
||||
_refresh_worlds()
|
||||
|
||||
|
||||
|
||||
func _show_build_stamp() -> void:
|
||||
var lbl := Label.new()
|
||||
var f := FileAccess.open("res://assets/build_info.json", FileAccess.READ)
|
||||
var stamp := "dev"
|
||||
if f != null:
|
||||
var d = JSON.parse_string(f.get_as_text())
|
||||
if d is Dictionary:
|
||||
stamp = "%s %s" % [d.get("checkpoint", "?"), d.get("commit", "?")]
|
||||
lbl.text = "build %s" % stamp
|
||||
lbl.add_theme_color_override("font_color", Color(1, 1, 0.35, 1.0))
|
||||
lbl.add_theme_color_override("font_outline_color", Color(0, 0, 0, 1.0))
|
||||
lbl.add_theme_constant_override("outline_size", 6)
|
||||
lbl.add_theme_font_size_override("font_size", 18)
|
||||
lbl.mouse_filter = Control.MOUSE_FILTER_IGNORE
|
||||
add_child(lbl)
|
||||
|
||||
var reposition := func() -> void:
|
||||
if is_instance_valid(lbl) and is_inside_tree():
|
||||
var vp := get_viewport().get_visible_rect().size
|
||||
lbl.position = Vector2(20, vp.y - 40)
|
||||
lbl.size = Vector2(vp.x - 40, 32)
|
||||
reposition.call()
|
||||
get_viewport().size_changed.connect(reposition)
|
||||
|
||||
|
||||
func _on_create_button_pressed() -> void:
|
||||
if _create_modal != null and is_instance_valid(_create_modal):
|
||||
_create_modal.queue_free()
|
||||
_create_modal = _build_create_world_modal()
|
||||
add_child(_create_modal)
|
||||
|
||||
|
||||
func _build_create_world_modal() -> Control:
|
||||
var overlay := ColorRect.new()
|
||||
overlay.name = "CreateWorldOverlay"
|
||||
overlay.color = Color(0, 0, 0, 0.75)
|
||||
overlay.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||
overlay.mouse_filter = Control.MOUSE_FILTER_STOP
|
||||
|
||||
var center := CenterContainer.new()
|
||||
center.set_anchors_preset(Control.PRESET_FULL_RECT)
|
||||
overlay.add_child(center)
|
||||
|
||||
var panel := PanelContainer.new()
|
||||
panel.custom_minimum_size = Vector2(480, 0)
|
||||
var style := StyleBoxFlat.new()
|
||||
style.bg_color = Color(0.18, 0.18, 0.22, 1.0)
|
||||
style.border_color = Color(0.4, 0.55, 0.8, 1.0)
|
||||
style.set_border_width_all(2)
|
||||
style.set_corner_radius_all(8)
|
||||
style.content_margin_left = 24
|
||||
style.content_margin_right = 24
|
||||
style.content_margin_top = 20
|
||||
style.content_margin_bottom = 20
|
||||
panel.add_theme_stylebox_override("panel", style)
|
||||
center.add_child(panel)
|
||||
|
||||
var form := VBoxContainer.new()
|
||||
form.add_theme_constant_override("separation", 12)
|
||||
panel.add_child(form)
|
||||
|
||||
var title := Label.new()
|
||||
title.text = "Create New World"
|
||||
title.horizontal_alignment = HORIZONTAL_ALIGNMENT_CENTER
|
||||
title.add_theme_font_size_override("font_size", 22)
|
||||
title.add_theme_color_override("font_color", Color(1.0, 1.0, 1.0))
|
||||
form.add_child(title)
|
||||
|
||||
var name_lbl := Label.new()
|
||||
name_lbl.text = "World Name:"
|
||||
name_lbl.add_theme_font_size_override("font_size", 14)
|
||||
form.add_child(name_lbl)
|
||||
|
||||
var name_input := LineEdit.new()
|
||||
name_input.placeholder_text = "Enter world name..."
|
||||
name_input.text = "My New World"
|
||||
form.add_child(name_input)
|
||||
|
||||
var desc_lbl := Label.new()
|
||||
desc_lbl.text = "Description:"
|
||||
desc_lbl.add_theme_font_size_override("font_size", 14)
|
||||
form.add_child(desc_lbl)
|
||||
|
||||
var desc_input := LineEdit.new()
|
||||
desc_input.placeholder_text = "Describe your world..."
|
||||
desc_input.text = "A creative build world"
|
||||
form.add_child(desc_input)
|
||||
|
||||
var err_label := Label.new()
|
||||
err_label.add_theme_font_size_override("font_size", 13)
|
||||
err_label.add_theme_color_override("font_color", Color(1.0, 0.4, 0.4))
|
||||
err_label.visible = false
|
||||
form.add_child(err_label)
|
||||
|
||||
var btn_row := HBoxContainer.new()
|
||||
btn_row.alignment = BoxContainer.ALIGNMENT_END
|
||||
btn_row.add_theme_constant_override("separation", 10)
|
||||
form.add_child(btn_row)
|
||||
|
||||
var cancel_btn := Button.new()
|
||||
cancel_btn.text = "Cancel"
|
||||
cancel_btn.pressed.connect(func(): overlay.queue_free())
|
||||
btn_row.add_child(cancel_btn)
|
||||
|
||||
var create_btn := Button.new()
|
||||
create_btn.text = "Create World"
|
||||
btn_row.add_child(create_btn)
|
||||
|
||||
var create_edit_btn := Button.new()
|
||||
create_edit_btn.text = "Create & Edit Now"
|
||||
btn_row.add_child(create_edit_btn)
|
||||
|
||||
var handle_create := func(open_editor: bool) -> void:
|
||||
var wname := name_input.text.strip_edges()
|
||||
if wname.is_empty():
|
||||
err_label.text = "World name cannot be empty."
|
||||
err_label.visible = true
|
||||
return
|
||||
create_btn.disabled = true
|
||||
create_edit_btn.disabled = true
|
||||
cancel_btn.disabled = true
|
||||
err_label.text = "Creating world..."
|
||||
err_label.add_theme_color_override("font_color", Color(0.8, 0.8, 0.8))
|
||||
err_label.visible = true
|
||||
|
||||
var res: Dictionary = await ApiClient.create_world(wname, desc_input.text.strip_edges())
|
||||
if not res.get("ok", false):
|
||||
create_btn.disabled = false
|
||||
create_edit_btn.disabled = false
|
||||
cancel_btn.disabled = false
|
||||
err_label.text = "Failed: %s" % str(res.get("detail", "unknown error"))
|
||||
err_label.add_theme_color_override("font_color", Color(1.0, 0.4, 0.4))
|
||||
return
|
||||
|
||||
var new_world: Dictionary = res.get("data", {})
|
||||
var new_world_id: int = int(new_world.get("id", 0))
|
||||
overlay.queue_free()
|
||||
|
||||
if open_editor and new_world_id > 0:
|
||||
Session.begin_edit(new_world_id)
|
||||
get_tree().change_scene_to_file("res://scenes/game.tscn")
|
||||
else:
|
||||
_refresh_worlds()
|
||||
|
||||
create_btn.pressed.connect(handle_create.bind(false))
|
||||
create_edit_btn.pressed.connect(handle_create.bind(true))
|
||||
|
||||
return overlay
|
||||
|
||||
|
||||
func _on_refresh_button_pressed() -> void:
|
||||
_refresh_worlds()
|
||||
|
||||
@@ -45,6 +201,7 @@ func _on_back_button_pressed() -> void:
|
||||
get_tree().change_scene_to_file("res://scenes/main_menu.tscn")
|
||||
|
||||
|
||||
|
||||
## Fetch the world list from the backend and update the UI.
|
||||
func _refresh_worlds() -> void:
|
||||
# Reset UI state
|
||||
@@ -121,13 +278,24 @@ func _create_world_card(world_dict: Dictionary) -> Control:
|
||||
card.add_theme_constant_override("separation", 4)
|
||||
panel.add_child(card)
|
||||
|
||||
var owner_id := int(world_dict.get("owner_id", -1))
|
||||
var is_owner := (_current_user_id != -1 and owner_id == _current_user_id)
|
||||
|
||||
var name_label := Label.new()
|
||||
name_label.text = world_dict.get("name", "Unnamed World")
|
||||
var raw_name: String = world_dict.get("name", "Unnamed World")
|
||||
if is_owner:
|
||||
name_label.text = "%s ★ [Your World]" % raw_name
|
||||
name_label.add_theme_color_override("font_color", Color(1.0, 0.9, 0.4, 1.0))
|
||||
style.border_color = Color(0.7, 0.6, 0.2, 0.8)
|
||||
style.set_border_width_all(2)
|
||||
else:
|
||||
name_label.text = raw_name
|
||||
name_label.autowrap_mode = TextServer.AUTOWRAP_WORD
|
||||
name_label.size_flags_horizontal = Control.SIZE_FILL
|
||||
name_label.size_flags_vertical = Control.SIZE_SHRINK_BEGIN
|
||||
name_label.add_theme_font_size_override("font_size", 18)
|
||||
|
||||
|
||||
var desc_label := Label.new()
|
||||
var description: String = str(world_dict.get("description", ""))
|
||||
desc_label.text = description if description != "" else "No description."
|
||||
@@ -166,8 +334,7 @@ func _create_world_card(world_dict: Dictionary) -> Control:
|
||||
# shown for the world's owner, matching the write-side authorization the
|
||||
# save path itself enforces (§5.3), so a non-owner never sees a button
|
||||
# that would just 403 on the first save.
|
||||
var owner_id := int(world_dict.get("owner_id", -1))
|
||||
if _current_user_id != -1 and owner_id == _current_user_id:
|
||||
if is_owner:
|
||||
var edit_button := Button.new()
|
||||
edit_button.text = "Edit World"
|
||||
edit_button.size_flags_horizontal = Control.SIZE_SHRINK_BEGIN
|
||||
|
||||
Reference in New Issue
Block a user