Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Inventory resource rework and slot aspect fix

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-05-20 22:27:48 +02:00
parent ec5d42068e
commit 2c677a8cda
15 changed files with 125 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
prefabs/Player2D.tscn
+1 -1
View File
@@ -3506,7 +3506,7 @@ position = Vector2(0, 374)
collision_layer = 4
collision_mask = 3
script = ExtResource("1_ssqtd")
_speed = 500.0
_speed = 1500.0
_sprite = NodePath("visuals/Animated Sprites")
[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]
prefabs/UI/Inventory/Inventory.tscn
+1 -10
View File
@@ -1,15 +1,10 @@
[gd_scene load_steps=11 format=3 uid="uid://cgjc4wurbgimy"]
[gd_scene load_steps=6 format=3 uid="uid://cgjc4wurbgimy"]
[ext_resource type="Script" uid="uid://hg7jay2kt441" path="res://scripts/CSharp/Common/Inventory/InventoryUi.cs" id="1_6wusm"]
[ext_resource type="Script" uid="uid://b2jhdxcrhtm2d" path="res://scripts/CSharp/Common/Inventory/InventoryTestScript.cs" id="3_exrk4"]
[ext_resource type="Texture2D" uid="uid://3ln8aleyxgp1" path="res://art/ui/UI/UI_bag_export_01.png" id="3_vvo7l"]
[ext_resource type="Texture2D" uid="uid://dcidjcsqk12p1" path="res://art/ui/UI/UI_bag_export_02.png" id="4_df8i8"]
[ext_resource type="Texture2D" uid="uid://c7wqla0mbu3np" path="res://art/ui/babushka_ui_tmp_inventory_select.png" id="4_tiss4"]
[ext_resource type="PackedScene" uid="uid://c0kmdjeqkqrwv" path="res://prefabs/UI/Inventory/Slot.tscn" id="5_u7kje"]
[ext_resource type="Resource" uid="uid://blr8tine5m0ma" path="res://resources/items/tomato.tres" id="7_l3npx"]
[ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="7_vvo7l"]
[ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="8_nw1un"]
[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/axe.tres" id="10_o7h8q"]
[node name="CanvasLayer" type="CanvasLayer"]
layer = 90
@@ -370,7 +365,3 @@ offset_left = 703.0
offset_top = 512.0
offset_right = 803.0
offset_bottom = 612.0
[node name="InventoryTester" type="Node" parent="Inventory"]
script = ExtResource("3_exrk4")
_testItemsToCreate = Array[Object]([ExtResource("7_l3npx"), ExtResource("7_l3npx"), ExtResource("8_nw1un"), ExtResource("7_vvo7l"), ExtResource("10_o7h8q"), ExtResource("7_l3npx"), ExtResource("8_nw1un"), ExtResource("8_nw1un"), ExtResource("8_nw1un"), ExtResource("8_nw1un"), ExtResource("7_vvo7l")])
prefabs/UI/Inventory/Slot.tscn
+2 -1
View File
@@ -70,6 +70,7 @@ offset_bottom = -10.0
grow_horizontal = 2
grow_vertical = 2
texture = ExtResource("3_n5ryf")
expand_mode = 1
expand_mode = 4
stretch_mode = 5
[connection signal="gui_input" from="." to="." method="_on_gui_input"]
prefabs/interactions/generic_item_on_ground.tscn
+1 -1
View File
@@ -3,7 +3,7 @@
[ext_resource type="Script" uid="uid://udhigottc8rg" path="res://scripts/CSharp/Common/Inventory/ItemOnGround.cs" id="1_mnomu"]
[ext_resource type="PackedScene" uid="uid://ob04y3syvo0e" path="res://prefabs/interaction_area.tscn" id="2_ue6ub"]
[ext_resource type="Script" uid="uid://c8suoi3i6kqai" path="res://scripts/CSharp/Common/Inventory/ItemOnGroundSpawnWith.cs" id="3_ue6ub"]
[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/axe.tres" id="4_sfad0"]
[ext_resource type="Resource" uid="uid://c7viddcd3kywp" path="res://resources/items/shovel.tres" id="4_sfad0"]
[node name="GenericItemOnGround" type="Node3D"]
script = ExtResource("1_mnomu")