Added item journal

items/active_items/bow/bow.tscn

@@ -17,6 +17,8 @@ collision_mask = 4
 script = ExtResource("1_xppub")
 arrow_scene = ExtResource("2_0id2q")
 sprite = ExtResource("3_vkelq")
+icon = ExtResource("3_vkelq")
+item_name = "Bow"
 
 [node name="EarthAligner" parent="." instance=ExtResource("4_0id2q")]
 
@@ -32,7 +34,7 @@ scale = Vector2(1.5, 1.5)
 texture = ExtResource("5_o1smo")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
-scale = Vector2(0.7, 0.7)
+scale = Vector2(1.4, 1.4)
 texture = ExtResource("3_vkelq")
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]

items/active_items/horizontal_dash/horizontal_dash.tscn

@@ -14,6 +14,8 @@ radius = 12.6667
 scale = Vector2(1.4, 1.4)
 script = ExtResource("1_ktd5x")
 sprite = ExtResource("3_ktd5x")
+icon = ExtResource("3_ktd5x")
+item_name = "Dash"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 visible = false
@@ -37,7 +39,7 @@ texture = ExtResource("3_vqrqe")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 position = Vector2(4.9999995, 12.999999)
-scale = Vector2(0.8, 0.8)
+scale = Vector2(1.6, 1.6)
 texture = ExtResource("3_ktd5x")
 
 [node name="EarthAligner" parent="." instance=ExtResource("4_gtuhj")]

items/active_items/updash/updash.tscn

@@ -13,6 +13,8 @@ radius = 12.6667
 [node name="Updash" type="Area2D"]
 script = ExtResource("1_ghbl6")
 sprite = ExtResource("3_a5yxq")
+icon = ExtResource("3_a5yxq")
+item_name = "Upward Boost"
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 visible = false
@@ -33,7 +35,7 @@ scale = Vector2(1.2, 1.2)
 texture = ExtResource("3_ssiqx")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
-scale = Vector2(0.8, 0.8)
+scale = Vector2(1.6, 1.6)
 texture = ExtResource("3_a5yxq")
 
 [node name="EarthAligner" parent="." instance=ExtResource("3_ktv3s")]

items/generic/item.gd

@@ -1,6 +1,8 @@
 class_name Item extends Area2D
 @onready var player = get_tree().get_root().get_node_or_null("main/Player")
 var collected = false
+@export var icon : Texture2D
+@export var item_name : String = ""
 
 func _process(_delta: float) -> void:
 	if(is_instance_valid(player) and overlaps_body(player)):

items/generic/item_pool.tres

@@ -1,4 +1,4 @@
-[gd_resource type="Resource" load_steps=11 format=3 uid="uid://m6yj45qvoecs"]
+[gd_resource type="Resource" script_class="ItemPool" load_steps=11 format=3 uid="uid://m6yj45qvoecs"]
 
 [ext_resource type="PackedScene" uid="uid://b00185vygcka1" path="res://items/immediate_items/heal_item/heal_item.tscn" id="1_2l6sh"]
 [ext_resource type="PackedScene" uid="uid://wc7kgtomy6xm" path="res://items/permanent_items/extrajump/extrajump.tscn" id="2_rli0f"]
@@ -14,5 +14,5 @@
 [resource]
 script = ExtResource("6_rli0f")
 common = Array[PackedScene]([ExtResource("1_2l6sh")])
-rare = Array[PackedScene]([ExtResource("2_rli0f"), ExtResource("3_g002j"), ExtResource("4_vpswe"), ExtResource("5_jwi73")])
+rare = Array[PackedScene]([ExtResource("3_g002j"), ExtResource("2_rli0f"), ExtResource("4_vpswe"), ExtResource("5_jwi73")])
 unique = Array[PackedScene]([ExtResource("6_73uum"), ExtResource("7_k6eth"), ExtResource("8_8cxou"), ExtResource("9_esvgx")])

items/immediate_items/heal_item/heal_item.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dog2yksitfgu1"
+path="res://.godot/imported/heal_item.png-fd96dcbc8e00ec13b19c3e58ef0188e6.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://items/immediate_items/heal_item/heal_item.png"
+dest_files=["res://.godot/imported/heal_item.png-fd96dcbc8e00ec13b19c3e58ef0188e6.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/immediate_items/heal_item/heal_item.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=7 format=3 uid="uid://b00185vygcka1"]
+[gd_scene load_steps=8 format=3 uid="uid://b00185vygcka1"]
 
 [ext_resource type="Script" uid="uid://b43fudwi47qfd" path="res://items/immediate_items/heal_item/heal_item.gd" id="1_3vbv8"]
+[ext_resource type="Texture2D" uid="uid://dog2yksitfgu1" path="res://items/immediate_items/heal_item/heal_item.png" id="2_bqles"]
 [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_evqwq"]
 [ext_resource type="Texture2D" uid="uid://djfc7sdc8wxp6" path="res://player/Heart_cut.png" id="3_fvuym"]
 [ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_sr4am"]
@@ -10,6 +11,8 @@
 
 [node name="HealItem" type="Area2D"]
 script = ExtResource("1_3vbv8")
+icon = ExtResource("2_bqles")
+item_name = "HP +1"
 
 [node name="EarthAligner" parent="." instance=ExtResource("2_evqwq")]
 

items/immediate_items/healthup/healthup.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cp4uia4l6j5nt"
+path="res://.godot/imported/healthup.png-154169bafb62b18f75d6b0b15f585161.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://items/immediate_items/healthup/healthup.png"
+dest_files=["res://.godot/imported/healthup.png-154169bafb62b18f75d6b0b15f585161.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/immediate_items/healthup/healthup.tscn

@@ -1,16 +1,17 @@
-[gd_scene load_steps=8 format=3 uid="uid://gwctb2xqsbj"]
+[gd_scene load_steps=7 format=3 uid="uid://gwctb2xqsbj"]
 
 [ext_resource type="Script" uid="uid://ce6fxbjarlvtk" path="res://items/immediate_items/healthup/healthup.gd" id="1_ivtxh"]
+[ext_resource type="Texture2D" uid="uid://cp4uia4l6j5nt" path="res://items/immediate_items/healthup/healthup.png" id="2_gb062"]
 [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="2_lolop"]
 [ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="3_gb062"]
-[ext_resource type="Texture2D" uid="uid://ctwu08w867gax" path="res://player/Heart_cut Grey.png" id="4_uq82b"]
-[ext_resource type="Texture2D" uid="uid://djfc7sdc8wxp6" path="res://player/Heart_cut.png" id="5_m76tj"]
 [ext_resource type="AudioStream" uid="uid://b37akn7hmk2r3" path="res://sounds/471834__keshafilm__health-pickup.wav" id="6_uq82b"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_rlcnv"]
 
 [node name="HealthUp" type="Area2D"]
 script = ExtResource("1_ivtxh")
+icon = ExtResource("2_gb062")
+item_name = "Max HP +1"
 
 [node name="EarthAligner" parent="." instance=ExtResource("2_lolop")]
 
@@ -25,16 +26,10 @@ position = Vector2(1, -1)
 scale = Vector2(1.2, 1.2)
 texture = ExtResource("3_gb062")
 
-[node name="Sprite2D3" type="Sprite2D" parent="."]
-modulate = Color(1, 0.853464, 0.355128, 1)
-position = Vector2(5, -3)
-scale = Vector2(1.6, 1.6)
-texture = ExtResource("4_uq82b")
-
 [node name="Sprite2D" type="Sprite2D" parent="."]
 position = Vector2(4, -3)
-scale = Vector2(1.4, 1.4)
-texture = ExtResource("5_m76tj")
+scale = Vector2(1.1, 1.1)
+texture = ExtResource("2_gb062")
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("6_uq82b")

items/permanent_items/backslash/backslash.tscn

@@ -12,6 +12,8 @@
 [node name="Backslash" type="Area2D"]
 script = ExtResource("1_s4bdx")
 sword = ExtResource("2_u6vk4")
+icon = ExtResource("5_qg660")
+item_name = "Second Blade"
 
 [node name="EarthAligner" parent="." instance=ExtResource("2_kiuxs")]
 
@@ -27,7 +29,7 @@ texture = ExtResource("4_legpc")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 position = Vector2(-3, -2)
-scale = Vector2(1.2, 1.2)
+scale = Vector2(2.4, 2.4)
 texture = ExtResource("5_qg660")
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]

items/permanent_items/extrajump/extrajump.tscn

@@ -11,6 +11,8 @@ size = Vector2(78, 82)
 
 [node name="ExtraJump" type="Area2D"]
 script = ExtResource("1_t7gtn")
+icon = ExtResource("3_t7gtn")
+item_name = "Bonus Jump"
 
 [node name="EarthAligner" parent="." instance=ExtResource("2_70c5v")]
 
@@ -26,7 +28,7 @@ scale = Vector2(1.5, 1.5)
 texture = ExtResource("3_hw3fr")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
-scale = Vector2(0.7, 0.7)
+scale = Vector2(1.4, 1.4)
 texture = ExtResource("3_t7gtn")
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]

items/permanent_items/high_jump/high_jump.tscn

@@ -10,6 +10,8 @@
 
 [node name="HighJump" type="Area2D"]
 script = ExtResource("1_7gixi")
+icon = ExtResource("4_7gixi")
+item_name = "Higher Jumps"
 metadata/_custom_type_script = "uid://c0uftljafcroy"
 
 [node name="EarthAligner" parent="." instance=ExtResource("2_s7mjt")]

items/permanent_items/upslash/upslash.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bhsmtgdpbxq46"
+path="res://.godot/imported/upslash.png-284818e0c0e6551e342cba63442fd5f7.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://items/permanent_items/upslash/upslash.png"
+dest_files=["res://.godot/imported/upslash.png-284818e0c0e6551e342cba63442fd5f7.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/permanent_items/upslash/upslash.tscn

@@ -1,16 +1,17 @@
-[gd_scene load_steps=8 format=3 uid="uid://bwtdls58ajair"]
+[gd_scene load_steps=7 format=3 uid="uid://bwtdls58ajair"]
 
 [ext_resource type="Script" uid="uid://cyql6o6m4xrv3" path="res://items/permanent_items/upslash/upslash.gd" id="1_vv4qh"]
 [ext_resource type="PackedScene" uid="uid://chs0u61f45nau" path="res://utils/earth_aligner.tscn" id="3_ayb0v"]
+[ext_resource type="Texture2D" uid="uid://bhsmtgdpbxq46" path="res://items/permanent_items/upslash/upslash.png" id="4_4ynxq"]
 [ext_resource type="Texture2D" uid="uid://d4mrbgfl7jpqq" path="res://items/ItemShine.png" id="4_35mg8"]
-[ext_resource type="Texture2D" uid="uid://c7mrm8uel7r36" path="res://items/permanent_items/backslash/backslash.png" id="5_f1n28"]
-[ext_resource type="Texture2D" uid="uid://dxcfkdhl4g24c" path="res://items/active_items/updash/updash.png" id="6_4gfq4"]
 [ext_resource type="AudioStream" uid="uid://pdd0sy3p4y0d" path="res://sounds/750240__universfield__coin-drop.mp3" id="6_5tj4p"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_hvhjo"]
 
 [node name="Upslash" type="Area2D"]
 script = ExtResource("1_vv4qh")
+icon = ExtResource("4_4ynxq")
+item_name = "Upward Slash"
 
 [node name="EarthAligner" parent="." instance=ExtResource("3_ayb0v")]
 
@@ -24,17 +25,10 @@ modulate = Color(0.725757, 0.519822, 5.77569e-07, 1)
 scale = Vector2(2.5, 2.5)
 texture = ExtResource("4_35mg8")
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
-position = Vector2(0, -13)
-rotation = 0.7853982
-scale = Vector2(1.2, 1.2)
-texture = ExtResource("5_f1n28")
-
 [node name="Sprite2D3" type="Sprite2D" parent="."]
-z_index = -1
-position = Vector2(2, -18)
-scale = Vector2(1.4, 1.4)
-texture = ExtResource("6_4gfq4")
+position = Vector2(0, -18)
+scale = Vector2(2.8, 2.8)
+texture = ExtResource("4_4ynxq")
 
 [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource("6_5tj4p")

main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://cxo6bq26huau7"]
+[gd_scene load_steps=15 format=3 uid="uid://cxo6bq26huau7"]
 
 [ext_resource type="PackedScene" uid="uid://cmaovvr15b3qk" path="res://player/player.tscn" id="2_1bvp3"]
 [ext_resource type="Texture2D" uid="uid://d3fpq76anm4t7" path="res://world/Background Prototype/Background prototype.png" id="3_kek77"]
@@ -12,6 +12,7 @@
 [ext_resource type="Script" uid="uid://3k6r3jnko4hg" path="res://utils/show_fps.gd" id="8_5vw27"]
 [ext_resource type="PackedScene" uid="uid://ca5ndobertnp4" path="res://water/water.tscn" id="10_4c57u"]
 [ext_resource type="Script" uid="uid://cpaskpj67pnaj" path="res://enemies/boss/boss_spawner.gd" id="10_efxa6"]
+[ext_resource type="PackedScene" uid="uid://cqn67nwyrtq3k" path="res://ui/journal/journal.tscn" id="10_w48qg"]
 [ext_resource type="PackedScene" uid="uid://cpe4s6vsn0ujd" path="res://enemies/boss/boss.tscn" id="11_efxa6"]
 
 [node name="main" type="Node2D"]
@@ -68,6 +69,9 @@ offset_bottom = 23.0
 grow_horizontal = 0
 script = ExtResource("8_5vw27")
 
+[node name="Journal" parent="UIOverlay" instance=ExtResource("10_w48qg")]
+visible = false
+
 [node name="Water" parent="." instance=ExtResource("10_4c57u")]
 unique_name_in_owner = true
 z_index = 15

project.godot

@@ -74,6 +74,11 @@ up={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
 ]
 }
+journal={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":74,"key_label":0,"unicode":106,"location":0,"echo":false,"script":null)
+]
+}
 
 [layer_names]
 
@@ -82,3 +87,7 @@ up={
 2d_physics/layer_4="SolidGround"
 2d_physics/layer_5="EnemyHurtBoxNonTrap"
 2d_physics/layer_6="TrulySolidGround"
+
+[rendering]
+
+textures/canvas_textures/default_texture_filter=0

ui/journal/journal.gd

@@ -0,0 +1,19 @@
+extends Control
+
+@onready var item_list : ItemList = $ItemList
+
+func _ready() -> void:
+	await get_tree().create_timer(0.3).timeout
+	for item_scene in ItemSpawn.item_pool.common:
+		add_item_to_journal(item_scene.instantiate())
+	for item_scene in ItemSpawn.item_pool.rare:
+		add_item_to_journal(item_scene.instantiate())
+	for item_scene in ItemSpawn.item_pool.unique:
+		add_item_to_journal(item_scene.instantiate())
+
+func _process(_delta: float) -> void:
+	if Input.is_action_just_pressed("journal"):
+		visible = not visible
+
+func add_item_to_journal(item: Item):
+	item_list.add_item(item.item_name, item.icon)

ui/journal/journal.gd.uid

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

ui/journal/journal.tscn

@@ -0,0 +1,21 @@
+[gd_scene load_steps=2 format=3 uid="uid://cqn67nwyrtq3k"]
+
+[ext_resource type="Script" uid="uid://bb8ojv1mwuyy5" path="res://ui/journal/journal.gd" id="1_q8app"]
+
+[node name="Journal" type="Control"]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_q8app")
+
+[node name="ItemList" type="ItemList" parent="."]
+layout_mode = 0
+offset_left = 610.0
+offset_top = 70.0
+offset_right = 1310.0
+offset_bottom = 970.0
+max_text_lines = 2
+item_count = 1