Inventory and hotbar

EclipsedMango · Jun 27, 2024 · 124f4bb · 124f4bb
1 parent 9ee79f4
commit 124f4bb
Show file tree

Hide file tree

Showing 13 changed files with 464 additions and 21 deletions.
diff --git a/Assets/Art/Textures/inventory.png b/Assets/Art/Textures/inventory.png
diff --git a/Assets/Art/Textures/inventory.png.import b/Assets/Art/Textures/inventory.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://crurudbckpe4j"
+path="res://.godot/imported/inventory.png-d4a633052e781730f979888c7ef286ec.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Assets/Art/Textures/inventory.png"
+dest_files=["res://.godot/imported/inventory.png-d4a633052e781730f979888c7ef286ec.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+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/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
diff --git a/Scenes/inventory.tscn b/Scenes/inventory.tscn
@@ -0,0 +1,199 @@
+[gd_scene load_steps=5 format=3 uid="uid://bx3enqaqj2bvq"]
+
+[ext_resource type="Script" path="res://Scripts/Inventory.gd" id="1_hpfk4"]
+[ext_resource type="Texture2D" uid="uid://crurudbckpe4j" path="res://Assets/Art/Textures/inventory.png" id="1_qivim"]
+[ext_resource type="PackedScene" uid="uid://cccy3p17tx25c" path="res://Scenes/ui_item_stack.tscn" id="2_mmi5o"]
+[ext_resource type="Texture2D" uid="uid://der152ylpctsg" path="res://icon.svg" id="4_6llqd"]
+
+[node name="Inventory" type="CenterContainer"]
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+script = ExtResource("1_hpfk4")
+
+[node name="Control" type="Control" parent="."]
+custom_minimum_size = Vector2(900, 600)
+layout_mode = 2
+
+[node name="TextureRect" type="TextureRect" parent="Control"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+texture = ExtResource("1_qivim")
+expand_mode = 1
+stretch_mode = 5
+
+[node name="GridContainer" type="GridContainer" parent="Control"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_left = 85.0
+offset_top = 126.0
+offset_right = -90.0
+offset_bottom = -229.0
+grow_horizontal = 2
+grow_vertical = 2
+columns = 9
+
+[node name="TextureRect" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect2" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect3" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect4" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect5" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect6" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect7" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect8" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect9" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect10" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect11" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect12" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect13" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect14" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect15" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect16" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect17" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect18" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect19" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect20" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect21" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect22" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect23" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect24" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect25" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect26" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect27" parent="Control/GridContainer" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="GridContainer2" type="GridContainer" parent="Control"]
+layout_mode = 1
+anchors_preset = 14
+anchor_top = 0.5
+anchor_right = 1.0
+anchor_bottom = 0.5
+offset_left = 85.0
+offset_top = 85.0
+offset_right = -89.0
+offset_bottom = 164.0
+grow_horizontal = 2
+grow_vertical = 2
+columns = 9
+
+[node name="TextureRect" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect2" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect3" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect4" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect5" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect6" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect7" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect8" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="TextureRect9" parent="Control/GridContainer2" instance=ExtResource("2_mmi5o")]
+layout_mode = 2
+
+[node name="CursorItem" type="MarginContainer" parent="Control"]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -50.0
+offset_top = -50.0
+offset_right = 50.0
+offset_bottom = 50.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 3
+size_flags_vertical = 3
+mouse_filter = 2
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="TextureRect" type="TextureRect" parent="Control/CursorItem"]
+visible = false
+layout_mode = 2
+mouse_filter = 2
+texture = ExtResource("4_6llqd")
+expand_mode = 1
+stretch_mode = 5
+
+[node name="ItemCount" type="Label" parent="Control/CursorItem"]
+layout_mode = 2
+text = "Hallo"
+horizontal_alignment = 1
diff --git a/Scenes/main.tscn b/Scenes/main.tscn
@@ -3,7 +3,7 @@
 [ext_resource type="PackedScene" uid="uid://wygpiaun5mxw" path="res://Scenes/terrain_test.tscn" id="1_6r6n0"]
 [ext_resource type="PackedScene" uid="uid://bbuymm13kjypt" path="res://Scenes/player.tscn" id="2_voc7m"]
 [ext_resource type="PackedScene" uid="uid://brq1rqhw4t21k" path="res://Scenes/rock.tscn" id="4_6j0fb"]
-[ext_resource type="Script" path="res://Scenes/Rockspawner.gd" id="4_ye4sx"]
+[ext_resource type="Script" path="res://Scripts/Rockspawner.gd" id="4_ye4sx"]
 [ext_resource type="Script" path="res://Scripts/FPS.gd" id="5_ro4ot"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_qq1ji"]
@@ -28,17 +28,17 @@ ssao_enabled = true
 ssao_radius = 12.36
 ssao_intensity = 3.11
 ssao_power = 1.66435
-ssao_detail = 1.14
+ssao_detail = 1.27
 ssao_horizon = 0.12
-fog_enabled = true
 fog_light_energy = 2.0
 fog_density = 0.001
 fog_sky_affect = 0.094
-volumetric_fog_density = 0.031
-volumetric_fog_albedo = Color(0.541176, 0.74902, 0.858824, 1)
-volumetric_fog_emission = Color(0.67451, 0.827451, 0.909804, 1)
+volumetric_fog_enabled = true
+volumetric_fog_density = 0.0208
+volumetric_fog_albedo = Color(0.206077, 0.375678, 0.460733, 1)
+volumetric_fog_emission = Color(0.648226, 0.795134, 0.849093, 1)
 volumetric_fog_detail_spread = 5.2233
-volumetric_fog_sky_affect = 0.0
+volumetric_fog_sky_affect = 0.807
 
 [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_ah7ol"]
 dof_blur_far_enabled = true
@@ -71,6 +71,7 @@ shadow_enabled = true
 [node name="FPS" type="Label" parent="PlayerRelated"]
 offset_right = 40.0
 offset_bottom = 23.0
+horizontal_alignment = 1
 script = ExtResource("5_ro4ot")
 
 [node name="Blocks" type="Node" parent="."]

diff --git a/Scenes/player.tscn b/Scenes/player.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=6 format=3 uid="uid://bbuymm13kjypt"]
+[gd_scene load_steps=7 format=3 uid="uid://bbuymm13kjypt"]
 
 [ext_resource type="Script" path="res://Scripts/Player.gd" id="1_btcab"]
 [ext_resource type="Script" path="res://Scripts/PlayerCam.gd" id="2_m88ak"]
 [ext_resource type="Script" path="res://Scripts/PauseMenu.gd" id="3_gwn0o"]
 [ext_resource type="Script" path="res://Scripts/RespawnMenu.gd" id="4_a400j"]
+[ext_resource type="PackedScene" uid="uid://bx3enqaqj2bvq" path="res://Scenes/inventory.tscn" id="5_ejf2h"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_3vo23"]
 radius = 0.25
@@ -37,6 +38,7 @@ grow_vertical = 0
 text = "health: 10"
 
 [node name="PauseMenu" type="Control" parent="."]
+visible = false
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -103,6 +105,7 @@ theme_override_font_sizes/font_size = 50
 text = "Epic Survival Game"
 
 [node name="RespawnMenu" type="Control" parent="."]
+visible = false
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -180,6 +183,8 @@ layout_mode = 2
 theme_override_font_sizes/font_size = 50
 text = "You Died!"
 
+[node name="Inventory" parent="." instance=ExtResource("5_ejf2h")]
+
 [connection signal="pressed" from="PauseMenu/ButtonMenu/PanelContainer/MarginContainer/VBoxContainer/Resume" to="PauseMenu" method="_on_resume_pressed"]
 [connection signal="pressed" from="PauseMenu/ButtonMenu/PanelContainer/MarginContainer/VBoxContainer/Exit to Menu" to="PauseMenu" method="_on_exit_to_menu_pressed"]
 [connection signal="pressed" from="RespawnMenu/ButtonMenu/PanelContainer/MarginContainer/VBoxContainer/Respawn" to="RespawnMenu" method="_on_respawn_pressed"]

diff --git a/Scenes/terrain_test.tscn b/Scenes/terrain_test.tscn
@@ -52,8 +52,8 @@ noise = SubResource("FastNoiseLite_shldw")
 render_priority = 0
 shader = ExtResource("3_kne2j")
 shader_parameter/ColorParameter = Color(0, 0.264767, 0, 1)
-shader_parameter/ColorParameter2 = Color(0.422555, 0.551007, 0.256161, 1)
-shader_parameter/ColorParameter3 = Color(0.228676, 0.5527, 0.29651, 1)
+shader_parameter/ColorParameter2 = Color(0.319138, 0.540952, 0.232688, 1)
+shader_parameter/ColorParameter3 = Color(0.292297, 0.626588, 0.326294, 1)
 shader_parameter/WindNoise = SubResource("NoiseTexture2D_iyhp4")
 shader_parameter/Texture2DParameter2 = SubResource("NoiseTexture2D_pcmc0")
 

diff --git a/Scenes/ui_item_stack.tscn b/Scenes/ui_item_stack.tscn
@@ -0,0 +1,50 @@
+[gd_scene load_steps=6 format=3 uid="uid://cccy3p17tx25c"]
+
+[ext_resource type="Texture2D" uid="uid://der152ylpctsg" path="res://icon.svg" id="1_0eoka"]
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_ie2xh"]
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7dbr3"]
+bg_color = Color(1, 1, 1, 0.34902)
+corner_radius_top_left = 10
+corner_radius_top_right = 10
+corner_radius_bottom_right = 10
+corner_radius_bottom_left = 10
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_plqoo"]
+bg_color = Color(0, 0, 0, 0.427451)
+corner_radius_top_left = 10
+corner_radius_top_right = 10
+corner_radius_bottom_right = 10
+corner_radius_bottom_left = 10
+
+[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_3smpp"]
+
+[node name="hallo" type="MarginContainer"]
+offset_right = 100.0
+offset_bottom = 100.0
+size_flags_horizontal = 3
+size_flags_vertical = 3
+theme_override_constants/margin_left = 10
+theme_override_constants/margin_top = 10
+theme_override_constants/margin_right = 10
+theme_override_constants/margin_bottom = 10
+
+[node name="TextureRect" type="TextureRect" parent="."]
+visible = false
+layout_mode = 2
+texture = ExtResource("1_0eoka")
+expand_mode = 1
+stretch_mode = 5
+
+[node name="ItemCount" type="Label" parent="."]
+layout_mode = 2
+text = "Hallo"
+horizontal_alignment = 1
+
+[node name="Button" type="Button" parent="."]
+layout_mode = 2
+theme_override_styles/normal = SubResource("StyleBoxEmpty_ie2xh")
+theme_override_styles/hover = SubResource("StyleBoxFlat_7dbr3")
+theme_override_styles/pressed = SubResource("StyleBoxFlat_plqoo")
+theme_override_styles/focus = SubResource("StyleBoxEmpty_3smpp")