From 2de96dd7bb36e9aeefed55391f519f023bfac649 Mon Sep 17 00:00:00 2001 From: Voyager Date: Fri, 31 Jul 2026 16:51:18 -0400 Subject: [PATCH] Import item icons and notepad artwork --- art/ui/ui_notepad.png | Bin 0 -> 28127 bytes .../ui/ui_notepad.png.import | 11 ++-- items/catalog/coffee.tres | 2 +- items/catalog/energy_drink.tres | 2 +- items/catalog/fish_finder.tres | 2 +- items/catalog/snack.tres | 4 +- .../consumables/64_consumable_coffee.png | Bin 0 -> 4245 bytes .../64_consumable_coffee.png.import} | 11 ++-- .../consumables/64_consumable_coffee_plus.png | Bin 0 -> 4039 bytes .../64_consumable_coffee_plus.png.import} | 11 ++-- .../consumables/64_consumable_energybar.png | Bin 0 -> 6563 bytes .../64_consumable_energybar.png.import} | 11 ++-- .../64_consumable_energydrink_redfish.png | Bin 0 -> 4887 bytes ..._consumable_energydrink_redfish.png.import | 40 +++++++++++++++ .../icons/consumables/64_consumable_fish.png | Bin 0 -> 4851 bytes .../consumables/64_consumable_fish.png.import | 40 +++++++++++++++ .../consumables/64_consumable_fishfinder.png | Bin 0 -> 5579 bytes .../64_consumable_fishfinder.png.import | 40 +++++++++++++++ items/icons/placeholder/coffee.svg | 5 -- items/icons/placeholder/energy_drink.svg | 4 -- items/icons/placeholder/fish_finder.svg | 6 --- items/icons/placeholder/snack.svg | 5 -- ui/components/inventory_notepad.gd | 48 +++++++----------- ui/player_menu.gd | 2 +- 24 files changed, 159 insertions(+), 85 deletions(-) create mode 100644 art/ui/ui_notepad.png rename items/icons/placeholder/snack.svg.import => art/ui/ui_notepad.png.import (67%) create mode 100644 items/icons/consumables/64_consumable_coffee.png rename items/icons/{placeholder/coffee.svg.import => consumables/64_consumable_coffee.png.import} (67%) create mode 100644 items/icons/consumables/64_consumable_coffee_plus.png rename items/icons/{placeholder/fish_finder.svg.import => consumables/64_consumable_coffee_plus.png.import} (66%) create mode 100644 items/icons/consumables/64_consumable_energybar.png rename items/icons/{placeholder/energy_drink.svg.import => consumables/64_consumable_energybar.png.import} (66%) create mode 100644 items/icons/consumables/64_consumable_energydrink_redfish.png create mode 100644 items/icons/consumables/64_consumable_energydrink_redfish.png.import create mode 100644 items/icons/consumables/64_consumable_fish.png create mode 100644 items/icons/consumables/64_consumable_fish.png.import create mode 100644 items/icons/consumables/64_consumable_fishfinder.png create mode 100644 items/icons/consumables/64_consumable_fishfinder.png.import delete mode 100644 items/icons/placeholder/coffee.svg delete mode 100644 items/icons/placeholder/energy_drink.svg delete mode 100644 items/icons/placeholder/fish_finder.svg delete mode 100644 items/icons/placeholder/snack.svg diff --git a/art/ui/ui_notepad.png b/art/ui/ui_notepad.png new file mode 100644 index 0000000000000000000000000000000000000000..eab6ff4ebe78dcc47e310b77860306cf9fe3252c GIT binary patch literal 28127 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 KMNUMnLSTaR46M)q literal 0 HcmV?d00001 diff --git a/items/icons/placeholder/snack.svg.import b/art/ui/ui_notepad.png.import similarity index 67% rename from items/icons/placeholder/snack.svg.import rename to art/ui/ui_notepad.png.import index 5ad06b4..9844e04 100644 --- a/items/icons/placeholder/snack.svg.import +++ b/art/ui/ui_notepad.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://i611n7iwr8i6" -path="res://.godot/imported/snack.svg-dfbab25d47c1c79c46c1d7fcf9b21cfe.ctex" +uid="uid://qmot6d6u44yq" +path="res://.godot/imported/ui_notepad.png-4c175e6e85c581f3c18d5efd8a7cf669.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/icons/placeholder/snack.svg" -dest_files=["res://.godot/imported/snack.svg-dfbab25d47c1c79c46c1d7fcf9b21cfe.ctex"] +source_file="res://art/ui/ui_notepad.png" +dest_files=["res://.godot/imported/ui_notepad.png-4c175e6e85c581f3c18d5efd8a7cf669.ctex"] [params] @@ -38,6 +38,3 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/items/catalog/coffee.tres b/items/catalog/coffee.tres index 755b671..00d5206 100644 --- a/items/catalog/coffee.tres +++ b/items/catalog/coffee.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3] [ext_resource type="Script" path="res://items/item_data.gd" id="1"] -[ext_resource type="Texture2D" path="res://items/icons/placeholder/coffee.svg" id="2"] +[ext_resource type="Texture2D" path="res://items/icons/consumables/64_consumable_coffee.png" id="2"] [resource] script = ExtResource("1") diff --git a/items/catalog/energy_drink.tres b/items/catalog/energy_drink.tres index 813230e..d3fcd93 100644 --- a/items/catalog/energy_drink.tres +++ b/items/catalog/energy_drink.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3] [ext_resource type="Script" path="res://items/item_data.gd" id="1"] -[ext_resource type="Texture2D" path="res://items/icons/placeholder/energy_drink.svg" id="2"] +[ext_resource type="Texture2D" path="res://items/icons/consumables/64_consumable_energydrink_redfish.png" id="2"] [resource] script = ExtResource("1") diff --git a/items/catalog/fish_finder.tres b/items/catalog/fish_finder.tres index a37fb4a..4c6d4a2 100644 --- a/items/catalog/fish_finder.tres +++ b/items/catalog/fish_finder.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3] [ext_resource type="Script" path="res://items/item_data.gd" id="1"] -[ext_resource type="Texture2D" path="res://items/icons/placeholder/fish_finder.svg" id="2"] +[ext_resource type="Texture2D" path="res://items/icons/consumables/64_consumable_fishfinder.png" id="2"] [resource] script = ExtResource("1") diff --git a/items/catalog/snack.tres b/items/catalog/snack.tres index 9d7c89b..4215595 100644 --- a/items/catalog/snack.tres +++ b/items/catalog/snack.tres @@ -1,12 +1,12 @@ [gd_resource type="Resource" script_class="ItemData" load_steps=3 format=3] [ext_resource type="Script" path="res://items/item_data.gd" id="1"] -[ext_resource type="Texture2D" path="res://items/icons/placeholder/snack.svg" id="2"] +[ext_resource type="Texture2D" path="res://items/icons/consumables/64_consumable_energybar.png" id="2"] [resource] script = ExtResource("1") item_id = &"snack" -display_name = "snack" +display_name = "Energy Bar" description = "temporarily adds one barrier damage." category = 3 icon = ExtResource("2") diff --git a/items/icons/consumables/64_consumable_coffee.png b/items/icons/consumables/64_consumable_coffee.png new file mode 100644 index 0000000000000000000000000000000000000000..270f1913a57f9044cacefbaa1ed67f49946e9bc1 GIT binary patch literal 4245 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 V0Be{XL`whw002ovPDHLkV1hg2&rbjV literal 0 HcmV?d00001 diff --git a/items/icons/placeholder/energy_drink.svg.import b/items/icons/consumables/64_consumable_energybar.png.import similarity index 66% rename from items/icons/placeholder/energy_drink.svg.import rename to items/icons/consumables/64_consumable_energybar.png.import index 0e79f6a..d68f7f3 100644 --- a/items/icons/placeholder/energy_drink.svg.import +++ b/items/icons/consumables/64_consumable_energybar.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://d3elrkttv1f1h" -path="res://.godot/imported/energy_drink.svg-8d7bc90bd15610c7852e4cf522a5b1ca.ctex" +uid="uid://deqccg83oy4hw" +path="res://.godot/imported/64_consumable_energybar.png-8ac97efdf3bd5f681012ff6ea4dcdf16.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://items/icons/placeholder/energy_drink.svg" -dest_files=["res://.godot/imported/energy_drink.svg-8d7bc90bd15610c7852e4cf522a5b1ca.ctex"] +source_file="res://items/icons/consumables/64_consumable_energybar.png" +dest_files=["res://.godot/imported/64_consumable_energybar.png-8ac97efdf3bd5f681012ff6ea4dcdf16.ctex"] [params] @@ -38,6 +38,3 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/items/icons/consumables/64_consumable_energydrink_redfish.png b/items/icons/consumables/64_consumable_energydrink_redfish.png new file mode 100644 index 0000000000000000000000000000000000000000..e0f14574a84bfe6bc8a7e3e5ef3dd879666591d3 GIT binary patch literal 4887 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 - - - - diff --git a/items/icons/placeholder/energy_drink.svg b/items/icons/placeholder/energy_drink.svg deleted file mode 100644 index da04ac7..0000000 --- a/items/icons/placeholder/energy_drink.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/items/icons/placeholder/fish_finder.svg b/items/icons/placeholder/fish_finder.svg deleted file mode 100644 index 7bbc0b1..0000000 --- a/items/icons/placeholder/fish_finder.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/items/icons/placeholder/snack.svg b/items/icons/placeholder/snack.svg deleted file mode 100644 index edff1ec..0000000 --- a/items/icons/placeholder/snack.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/ui/components/inventory_notepad.gd b/ui/components/inventory_notepad.gd index de346c6..de5e119 100644 --- a/ui/components/inventory_notepad.gd +++ b/ui/components/inventory_notepad.gd @@ -1,16 +1,14 @@ class_name InventoryNotepad extends PanelContainer -const PAPER_COLOR := Color(0.93, 0.885, 0.73, 1.0) -const BORDER_COLOR := Color(0.22, 0.19, 0.15, 1.0) const INK_COLOR := Color(0.16, 0.16, 0.14, 1.0) -const BINDING_COLOR := Color(0.31, 0.27, 0.20, 0.80) -const RULE_COLOR := Color(0.44, 0.36, 0.24, 0.34) const CONTENT_MARGIN_LEFT := 18.0 const CONTENT_MARGIN_TOP := 98.0 const CONTENT_MARGIN_RIGHT := 18.0 const CONTENT_MARGIN_BOTTOM := 16.0 const HANDWRITTEN_FONT: Font = preload("res://ui/fonts/seattle_avenue.otf") +const NOTEPAD_TEXTURE: Texture2D = preload("res://art/ui/ui_notepad.png") +const NOTEPAD_ART_SCALE := 1.1 @export var title_text := "notes" @export var inset_content := true @@ -19,7 +17,7 @@ const HANDWRITTEN_FONT: Font = preload("res://ui/fonts/seattle_avenue.otf") func _ready() -> void: mouse_filter = Control.MOUSE_FILTER_PASS apply_handwritten_to(self) - add_theme_stylebox_override("panel", make_paper_style(inset_content)) + add_theme_stylebox_override("panel", make_layout_style(inset_content)) resized.connect(queue_redraw) queue_redraw() @@ -36,16 +34,19 @@ static func apply_handwritten_to(root: Control) -> void: func _draw() -> void: - var font: Font = HANDWRITTEN_FONT - draw_string( - font, - Vector2(28.0, 25.0), - "● ● ● ●", - HORIZONTAL_ALIGNMENT_CENTER, - size.x - 56.0, - 20, - BINDING_COLOR, + var texture_size := NOTEPAD_TEXTURE.get_size() + var uniform_scale := minf( + size.x / texture_size.x, + size.y / texture_size.y, + ) * NOTEPAD_ART_SCALE + var rendered_size := texture_size * uniform_scale + var rendered_rect := Rect2( + (size - rendered_size) * 0.5, + rendered_size, ) + draw_texture_rect(NOTEPAD_TEXTURE, rendered_rect, false) + + var font: Font = HANDWRITTEN_FONT draw_string( font, Vector2(20.0, 58.0), @@ -55,26 +56,11 @@ func _draw() -> void: 20, INK_COLOR, ) - draw_line( - Vector2(18.0, 87.0), - Vector2(size.x - 18.0, 87.0), - RULE_COLOR, - 2.0, - ) -static func make_paper_style(with_content_margins: bool = true) -> StyleBoxFlat: +static func make_layout_style(with_content_margins: bool = true) -> StyleBoxFlat: var paper := StyleBoxFlat.new() - paper.bg_color = PAPER_COLOR - paper.border_color = BORDER_COLOR - paper.set_border_width_all(4) - paper.corner_radius_top_left = 9 - paper.corner_radius_top_right = 7 - paper.corner_radius_bottom_right = 11 - paper.corner_radius_bottom_left = 8 - paper.shadow_color = Color(0.10, 0.08, 0.06, 0.46) - paper.shadow_size = 4 - paper.shadow_offset = Vector2(3.0, 4.0) + paper.bg_color = Color.TRANSPARENT if with_content_margins: paper.content_margin_left = CONTENT_MARGIN_LEFT paper.content_margin_top = CONTENT_MARGIN_TOP diff --git a/ui/player_menu.gd b/ui/player_menu.gd index 2c48a58..821823d 100644 --- a/ui/player_menu.gd +++ b/ui/player_menu.gd @@ -1202,7 +1202,7 @@ func _apply_cooler_wall_styles() -> void: func _apply_cooler_notepad_style() -> void: _detail_bubble.add_theme_stylebox_override( "panel", - InventoryNotepadType.make_paper_style(false), + InventoryNotepadType.make_layout_style(false), ) InventoryNotepadType.apply_handwritten_to(_detail_constellation)