Import item icons and notepad artwork

art/ui/ui_notepad.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://i611n7iwr8i6"
+uid="uid://qmot6d6u44yq"
-path="res://.godot/imported/snack.svg-dfbab25d47c1c79c46c1d7fcf9b21cfe.ctex"
+path="res://.godot/imported/ui_notepad.png-4c175e6e85c581f3c18d5efd8a7cf669.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://items/icons/placeholder/snack.svg"
+source_file="res://art/ui/ui_notepad.png"
-dest_files=["res://.godot/imported/snack.svg-dfbab25d47c1c79c46c1d7fcf9b21cfe.ctex"]
+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

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")

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")

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")

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")

items/icons/consumables/64_consumable_coffee.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ddx3pbgh2ele5"
+uid="uid://be3j2ahyt3cpe"
-path="res://.godot/imported/coffee.svg-aecf16cc8c38e5e0f432cd5395949bcf.ctex"
+path="res://.godot/imported/64_consumable_coffee.png-ba557079916477db3de4b894fdb65382.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://items/icons/placeholder/coffee.svg"
+source_file="res://items/icons/consumables/64_consumable_coffee.png"
-dest_files=["res://.godot/imported/coffee.svg-aecf16cc8c38e5e0f432cd5395949bcf.ctex"]
+dest_files=["res://.godot/imported/64_consumable_coffee.png-ba557079916477db3de4b894fdb65382.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

items/icons/consumables/64_consumable_coffee_plus.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cxsaix6vp7t6u"
+uid="uid://cxw5la6tr67di"
-path="res://.godot/imported/fish_finder.svg-33ab7d731566e03c2f84e185d3503b7d.ctex"
+path="res://.godot/imported/64_consumable_coffee_plus.png-512713373bb8b17a715adef67a378d07.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://items/icons/placeholder/fish_finder.svg"
+source_file="res://items/icons/consumables/64_consumable_coffee_plus.png"
-dest_files=["res://.godot/imported/fish_finder.svg-33ab7d731566e03c2f84e185d3503b7d.ctex"]
+dest_files=["res://.godot/imported/64_consumable_coffee_plus.png-512713373bb8b17a715adef67a378d07.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

items/icons/consumables/64_consumable_energybar.png.import

@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://d3elrkttv1f1h"
+uid="uid://deqccg83oy4hw"
-path="res://.godot/imported/energy_drink.svg-8d7bc90bd15610c7852e4cf522a5b1ca.ctex"
+path="res://.godot/imported/64_consumable_energybar.png-8ac97efdf3bd5f681012ff6ea4dcdf16.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://items/icons/placeholder/energy_drink.svg"
+source_file="res://items/icons/consumables/64_consumable_energybar.png"
-dest_files=["res://.godot/imported/energy_drink.svg-8d7bc90bd15610c7852e4cf522a5b1ca.ctex"]
+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

items/icons/consumables/64_consumable_energydrink_redfish.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d1jsfo8fy2cwx"
+path="res://.godot/imported/64_consumable_energydrink_redfish.png-c06a52f92093d918ce0318a12e99e46c.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://items/icons/consumables/64_consumable_energydrink_redfish.png"
+dest_files=["res://.godot/imported/64_consumable_energydrink_redfish.png-c06a52f92093d918ce0318a12e99e46c.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

items/icons/consumables/64_consumable_fish.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://m0hbd148mkit"
+path="res://.godot/imported/64_consumable_fish.png-a8d0ad1847950c457e505029adcac628.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://items/icons/consumables/64_consumable_fish.png"
+dest_files=["res://.godot/imported/64_consumable_fish.png-a8d0ad1847950c457e505029adcac628.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

items/icons/consumables/64_consumable_fishfinder.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://keij7qvi06oe"
+path="res://.godot/imported/64_consumable_fishfinder.png-b07857ff1ce529c6f69ccae5892d747a.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://items/icons/consumables/64_consumable_fishfinder.png"
+dest_files=["res://.godot/imported/64_consumable_fishfinder.png-b07857ff1ce529c6f69ccae5892d747a.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

items/icons/placeholder/coffee.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <path d="M18 22h29v27H18z" fill="#f3d6a4" stroke="#17243a" stroke-width="5"/>
-  <path d="M47 28h6q7 0 7 7t-7 7h-6" fill="none" stroke="#17243a" stroke-width="5"/>
-  <path d="M25 17q-5-5 0-10M38 17q-5-5 0-10" fill="none" stroke="#54c7c0" stroke-width="4" stroke-linecap="round"/>
-</svg>

items/icons/placeholder/energy_drink.svg

@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <path d="M20 9h25l3 7-3 39H20l-3-39z" fill="#ef6b88" stroke="#17243a" stroke-width="5"/>
-  <path d="M36 18l-10 17h8l-5 14 13-20h-8z" fill="#ffe26b" stroke="#17243a" stroke-width="3" stroke-linejoin="round"/>
-</svg>

items/icons/placeholder/fish_finder.svg

@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <rect x="8" y="10" width="48" height="44" rx="5" fill="#54c7c0" stroke="#17243a" stroke-width="5"/>
-  <circle cx="31" cy="32" r="15" fill="#dff7f3" stroke="#17243a" stroke-width="4"/>
-  <path d="M31 32q7-8 15 0M31 32q5 6 10 0" fill="none" stroke="#ef6b88" stroke-width="3"/>
-  <circle cx="31" cy="32" r="3" fill="#17243a"/>
-</svg>

items/icons/placeholder/snack.svg

@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64">
-  <path d="M12 17l8-7h30l5 9-5 35H17L9 46z" fill="#f7a84a" stroke="#17243a" stroke-width="5" stroke-linejoin="round"/>
-  <path d="M22 29h22M20 39h25" stroke="#fff3d4" stroke-width="5" stroke-linecap="round"/>
-  <path d="M50 10q-8 2-6 10 8 1 11-5z" fill="#fff3d4" stroke="#17243a" stroke-width="4"/>
-</svg>

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
+	var texture_size := NOTEPAD_TEXTURE.get_size()
-	draw_string(
+	var uniform_scale := minf(
-		font,
+		size.x / texture_size.x,
-		Vector2(28.0, 25.0),
+		size.y / texture_size.y,
-		"●   ●   ●   ●",
+	) * NOTEPAD_ART_SCALE
-		HORIZONTAL_ALIGNMENT_CENTER,
+	var rendered_size := texture_size * uniform_scale
-		size.x - 56.0,
+	var rendered_rect := Rect2(
-		20,
+		(size - rendered_size) * 0.5,
-		BINDING_COLOR,
+		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.bg_color = Color.TRANSPARENT
-	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)
 	if with_content_margins:
 		paper.content_margin_left = CONTENT_MARGIN_LEFT
 		paper.content_margin_top = CONTENT_MARGIN_TOP

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)