woofmeow/netfishing
woofmeow/netfishing
1
0
Fork 0
Code Issues 34 Pull requests Projects 1 Releases 24 Packages Wiki Activity Actions

Improve Logbook presentation

Browse source
This commit is contained in:
Alexander Sellite 2026-08-02 09:57:05 -04:00
parent 984f7c641c
commit c956301194
5 changed files with 578 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

158
tests/logbook_validation.gd
View file

@ -5,6 +5,12 @@ const FishInventoryType = preload("res://inventory/fish_inventory.gd")
const FishPoolType = preload("res://fish/fish_pool.gd")
const CollectionLogType = preload("res://collection/collection_log.gd")
const FishDataType = preload("res://fish/fish_data.gd")
const LogbookPortraitType = preload(
"res://ui/components/logbook_portrait.gd"
)
const InventoryNotepadType = preload(
"res://ui/components/inventory_notepad.gd"
)
const LogbookPageScene = preload("res://ui/logbook_page.tscn")
const CatalogResource: FishPoolType = preload(
"res://fish/pools/fish_catalog.tres"
@ -48,6 +54,12 @@ func _validate_catalog() -> void:
for index: int in expected_ids.size():
var fish := CatalogResource.get_fish_by_id(expected_ids[index])
assert(fish != null)
assert(LogbookCatalog.facts_for(fish.id) != "unknown")
assert(not LogbookCatalog.facts_for(fish.id).is_empty())
assert(
LogbookCatalog.facts_for(fish.id)
== LogbookCatalog.facts_for(fish.id).to_lower()
)
var expected_category: WaterType.Type = (
WaterType.Type.SALT_WATER
if expected_ids[index] in [&"bass", &"sunfish"]
@ -75,6 +87,14 @@ func _validate_page() -> void:
page.setup(collection, inventory, CatalogResource)
page.activate()
await process_frame
assert(page.get("_category") == WaterType.Type.FRESH_WATER)
assert((page.get("_catalog_grid") as GridContainer).columns == 5)
var initial_detail_body := page.get("_detail_body") as VBoxContainer
assert(not initial_detail_body.get_parent() is ScrollContainer)
assert(
page.call("_entry_label_text", "flathead catfish")
== "flathead\ncatfish"
)
var shared_material: Material
var silhouette_count: int = 0
@ -101,9 +121,13 @@ func _validate_page() -> void:
assert(entry.icon == null)
assert(entry.accessibility_name == "Unknown catalog entry")
assert(_has_visible_unknown_name(entry))
var portrait := _find_unknown_portrait(entry)
var portrait: LogbookPortraitType = _find_portrait(entry)
assert(portrait != null)
assert(portrait.texture == fish.display_texture)
assert(portrait.source_texture == fish.display_texture)
assert(
portrait.custom_minimum_size
== LogbookPortraitType.ENTRY_FRAME_SIZE
)
assert(
portrait.expand_mode
== TextureRect.EXPAND_IGNORE_SIZE
@ -154,10 +178,17 @@ func _validate_page() -> void:
var entries: Dictionary = page.get("_entry_buttons")
var known := entries.get(&"bluegill") as Button
assert(known != null)
assert(known.text == bluegill.display_name)
assert(known.icon == bluegill.display_texture)
assert(_find_unknown_portrait(known) == null)
assert(known.custom_minimum_size.x == known.custom_minimum_size.y)
_validate_entry_bubble_styles(known)
assert(known.text.is_empty())
assert(known.icon == null)
assert(_has_visible_name(known, bluegill.display_name))
var known_portrait: LogbookPortraitType = _find_portrait(known)
assert(known_portrait != null)
assert(known_portrait.source_texture == bluegill.display_texture)
assert(known_portrait.material == null)
assert(known.button_pressed)
_validate_handwritten_logbook_font(page)
var fish_catch := FishCatchType.new()
fish_catch.fish = bluegill
@ -174,9 +205,30 @@ func _validate_page() -> void:
page.call("_select_entry", &"bluegill", &"bluegill")
await process_frame
assert(_detail_text(page).contains("number owned\n1"))
assert(_detail_text(page).contains("number caught\nUnknown"))
assert(_detail_text(page).contains("body of water\nFresh Water"))
assert(_detail_text(page).contains("number caught\nunknown"))
assert(_detail_text(page).contains("body of water\nfresh water"))
assert(_detail_text(page).contains("catalog number\n#001"))
assert(_detail_text(page).contains("fish facts\n"))
assert(_detail_text(page).contains(LogbookCatalog.facts_for(&"bluegill")))
_validate_detail_field_fonts(page)
_validate_handwritten_numeric_scale(page)
var portrait_button := page.get("_detail_portrait_button") as Button
assert(portrait_button != null)
portrait_button.pressed.emit()
await process_frame
var portrait_overlay := page.get("_portrait_overlay") as Control
assert(portrait_overlay.visible)
var overlay_artwork := (
page.get("_portrait_overlay_artwork") as LogbookPortraitType
)
assert(overlay_artwork.source_texture == bluegill.display_texture)
assert(
overlay_artwork.custom_minimum_size.x <= 860.0
and overlay_artwork.custom_minimum_size.y <= 480.0
)
(page.get("_portrait_overlay_backdrop") as Button).pressed.emit()
await process_frame
assert(not portrait_overlay.visible)
inventory.remove_catch_by_id(fish_catch.catch_id)
await process_frame
@ -194,26 +246,110 @@ func _detail_text(page: LogbookPage) -> String:
return "\n".join(values)
func _find_unknown_portrait(entry: Button) -> TextureRect:
func _find_portrait(entry: Button) -> LogbookPortraitType:
var pending: Array[Node] = [entry]
while not pending.is_empty():
var node: Node = pending.pop_back()
if node is TextureRect:
return node as TextureRect
if node is LogbookPortraitType:
return node as LogbookPortraitType
pending.append_array(node.get_children())
return null
func _has_visible_unknown_name(entry: Button) -> bool:
return _has_visible_name(entry, "???")
func _has_visible_name(entry: Button, expected_name: String) -> bool:
var pending: Array[Node] = [entry]
while not pending.is_empty():
var node: Node = pending.pop_back()
if node is Label and (node as Label).text == "???":
if node is Label and (node as Label).text == expected_name:
return true
pending.append_array(node.get_children())
return false
func _validate_handwritten_logbook_font(page: LogbookPage) -> void:
var detail_body := page.get("_detail_body") as VBoxContainer
for node: Node in detail_body.find_children("*", "Label", true, false):
var label := node as Label
if label.text in [
"fish facts",
"catalog number",
"rarity",
"body of water",
"time of day",
"weight range",
"value range",
"number caught",
"number owned",
]:
continue
assert(
label.get_theme_font("font")
== InventoryNotepadType.HANDWRITTEN_FONT
)
func _validate_detail_field_fonts(page: LogbookPage) -> void:
var detail_body := page.get("_detail_body") as VBoxContainer
var field_names: Array[String] = [
"fish facts",
"catalog number",
"rarity",
"body of water",
"time of day",
"weight range",
"value range",
"number caught",
"number owned",
]
for node: Node in detail_body.find_children("*", "Label", true, false):
var label := node as Label
if label.text not in field_names:
continue
assert(label.get_theme_font("font") == UtilityPageStyle.TuffyFont)
if label.text != "fish facts":
assert(
label.horizontal_alignment
== HORIZONTAL_ALIGNMENT_CENTER
)
func _validate_handwritten_numeric_scale(page: LogbookPage) -> void:
var detail_body := page.get("_detail_body") as VBoxContainer
var text_value: Label
var numeric_value: Label
for node: Node in detail_body.find_children("*", "Label", true, false):
var label := node as Label
if label.text == "common":
text_value = label
elif label.text == "#001":
numeric_value = label
assert(text_value != null)
assert(numeric_value != null)
assert(
numeric_value.get_theme_font_size("font_size")
< text_value.get_theme_font_size("font_size")
)
func _validate_entry_bubble_styles(entry: Button) -> void:
var normal := entry.get_theme_stylebox("normal") as StyleBoxFlat
var hover := entry.get_theme_stylebox("hover") as StyleBoxFlat
var pressed := entry.get_theme_stylebox("pressed") as StyleBoxFlat
assert(normal != null)
assert(hover != null)
assert(pressed != null)
assert(is_zero_approx(normal.bg_color.a))
assert(hover.bg_color.a > 0.0)
assert(pressed.bg_color.a > 0.0)
assert(hover.border_width_left == 0)
assert(pressed.border_width_left == 0)
assert(hover.corner_radius_top_left == 51)
func _texture_has_transparency(texture: Texture2D) -> bool:
var image: Image = texture.get_image()
return image != null and image.detect_alpha() != Image.ALPHA_NONE