maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-10 18:15:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tabbed inventory

Browse source
This commit is contained in:
Marco 2025-03-13 13:29:13 +01:00
commit 6d7282f5cb
214 changed files with 9329 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

75
Scenes/HUD/HUD.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=23 format=3 uid="uid://dkwi1hu1bixoe"]
[gd_scene load_steps=24 format=3 uid="uid://dkwi1hu1bixoe"]
[ext_resource type="Script" uid="uid://baf6pxbvhqmjk" path="res://Scripts/Hud.cs" id="1_m0hb0"]
[ext_resource type="FontFile" uid="uid://ccm3u37q1hvux" path="res://fonts/Xolonium-Regular.ttf" id="2_0xmx2"]
@ -13,6 +13,7 @@
[ext_resource type="Theme" uid="uid://dnsadvmunm76k" path="res://Resources/Styles/MainMenuButtons.tres" id="9_sx5r0"]
[ext_resource type="StyleBox" uid="uid://ctw2hju32l3rg" path="res://Resources/Styles/PixelStyleBoxRed.tres" id="10_f3h51"]
[ext_resource type="Script" uid="uid://bobo5f4ud60qw" path="res://Scripts/UI/ItemsMenu.cs" id="10_oflr6"]
[ext_resource type="Script" uid="uid://com5b4ffsmj7s" path="res://Scripts/UI/InventoryMenu.cs" id="11_7pulb"]
[sub_resource type="LabelSettings" id="LabelSettings_a7f6n"]
font = ExtResource("2_0xmx2")
@ -190,27 +191,71 @@ offset_top = 26.0
offset_right = 226.0
offset_bottom = 144.0
[node name="Control" type="Control" parent="."]
layout_mode = 3
anchors_preset = 0
offset_left = 41.0
offset_top = 16.0
offset_right = 291.0
offset_bottom = 146.0
[node name="InventoryMenu" type="TabContainer" parent="."]
offset_left = 16.0
offset_top = 9.0
offset_right = 305.0
offset_bottom = 153.0
mouse_filter = 2
theme_override_fonts/font = ExtResource("6_sk1eq")
current_tab = 4
script = ExtResource("11_7pulb")
metadata/_edit_group_ = true
[node name="ItemList" type="ItemList" parent="Control"]
[node name="Weapons" type="ItemList" parent="InventoryMenu"]
visible = false
layout_mode = 1
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
layout_mode = 2
theme = ExtResource("9_sx5r0")
theme_override_styles/panel = ExtResource("10_f3h51")
allow_search = false
max_columns = 3
same_column_width = true
script = ExtResource("10_oflr6")
ItemsFilter = Array[int]([9])
metadata/_tab_index = 0
[node name="Consumables" type="ItemList" parent="InventoryMenu"]
visible = false
layout_mode = 2
theme = ExtResource("9_sx5r0")
theme_override_styles/panel = ExtResource("10_f3h51")
allow_search = false
max_columns = 3
same_column_width = true
script = ExtResource("10_oflr6")
ItemsFilter = Array[int]([4, 5, 8, 7, 6])
metadata/_tab_index = 1
[node name="Ammo" type="ItemList" parent="InventoryMenu"]
visible = false
layout_mode = 2
theme = ExtResource("9_sx5r0")
theme_override_styles/panel = ExtResource("10_f3h51")
allow_search = false
max_columns = 3
same_column_width = true
script = ExtResource("10_oflr6")
ItemsFilter = Array[int]([3])
metadata/_tab_index = 2
[node name="Key" type="ItemList" parent="InventoryMenu"]
visible = false
layout_mode = 2
theme = ExtResource("9_sx5r0")
theme_override_styles/panel = ExtResource("10_f3h51")
allow_search = false
max_columns = 3
same_column_width = true
script = ExtResource("10_oflr6")
ItemsFilter = Array[int]([0, 1, 2, 13, 10, 11, 12])
metadata/_tab_index = 3
[node name="Status" type="PanelContainer" parent="InventoryMenu"]
layout_mode = 2
metadata/_tab_index = 4
[node name="Label" type="Label" parent="InventoryMenu/Status"]
layout_mode = 2
size_flags_horizontal = 4
size_flags_vertical = 0
text = "Status"

2
Scenes/Interactable.cs
View file

@ -28,7 +28,7 @@ public partial class Interactable : Area2D, IInteractable
{
if (Requirements.Any())
{
if (InventoryManager.Instance.HasItems(Requirements.Select(x => x.ItemKey).ToList()))
if (InventoryManager.Instance.HasItems(Requirements.Select(x => x.ItemKey.ToString()).ToList()))
{
GD.Print($"Requirements for activation of {this.Name} successfully met: {string.Join(",", Requirements.Select(x => x.Item))} ");
return true;

2
Scenes/Maps/PlayerFSMTest.tscn
View file

@ -53,7 +53,7 @@
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_u1i8n")
EggIndex = 0
StartingEquipment = Array[ExtResource("5_u1i8n")]([])
StartingEquipment = []
[sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"]
size = Vector2(30, 52.5)

4
Scenes/test.tscn
View file

@ -201,7 +201,7 @@ ActivationType = 0
Targets = Array[NodePath]([NodePath("../Rumia")])
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_mah4x"]
[sub_resource type="Resource" id="Resource_qnbhd"]
resource_local_to_scene = true
script = ExtResource("49_0si7g")
Target = NodePath(".")
@ -821,7 +821,7 @@ Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_068l7"), SubResou
[node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")]
position = Vector2(-1487, -396)
Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_mah4x")])
Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_qnbhd")])
[node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")]
position = Vector2(-1657, -788)