Nikolai/project-thor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Itemsmanager

Browse Source 
Items now can be stored. I wanna kill myself
This commit is contained in:
Nikolai Fesenko
2025-08-18 20:31:52 +02:00
parent 7ba255334d
commit e4667a3a47
25 changed files with 233 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Scenes/Prefabs/Battery.tscn
View File

@@ -20,6 +20,7 @@ shader_parameter/color = Vector3(0, 0, 0)
render_priority = 0
shader = ExtResource("10_pigwg")
shader_parameter/is_active = false
shader_parameter/color = Vector3(0.95, 0.71, 0.01)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_byy4f"]
next_pass = SubResource("ShaderMaterial_pigwg")
@@ -76,6 +77,7 @@ surface_material_override/7 = SubResource("ShaderMaterial_hnq8j")
surface_material_override/8 = SubResource("StandardMaterial3D_byy4f")
[node name="StaticBody3D" type="StaticBody3D" parent="."]
input_ray_pickable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.053833, -0.776428, 0.0276413)

6
Scenes/Prefabs/DoubleBeds.tscn
View File

@@ -65,6 +65,7 @@ surface_material_override/1 = SubResource("StandardMaterial3D_k1k40")
surface_material_override/2 = SubResource("StandardMaterial3D_tma46")
[node name="StaticBody3D" type="StaticBody3D" parent="."]
input_ray_pickable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.218994, -0.287048, 0.10144)
@@ -75,15 +76,12 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.3739)
script = ExtResource("8_c1046")
[node name="Area3d" type="Area3D" parent="ActionNode"]
input_ray_pickable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="ActionNode/Area3d"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.839141, 0.470829)
shape = SubResource("SphereShape3D_c1046")
[node name="CSGSphere3D" type="CSGSphere3D" parent="ActionNode/Area3d"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.839141, 0.470829)
radius = 0.886475
[node name="PersonPos1" parent="ActionNode" instance=ExtResource("9_k1k40")]
transform = Transform3D(0.0323901, -0.298156, -0.00732965, 0.298245, 0.0323998, 0, 0.000791598, -0.00728678, 0.29991, -0.0940391, -1.07055, -1.60941)
visible = false

3
Scenes/Prefabs/Item.gd
View File

@@ -1,3 +0,0 @@
extends Node3D
var item_name

1
Scenes/Prefabs/Item.gd.uid
View File

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

3
Scenes/Prefabs/Pot.tscn
View File

@@ -24,6 +24,7 @@ size = Vector3(3.78918, 4.23603, 2.59656)
render_priority = 0
shader = ExtResource("7_gtq0i")
shader_parameter/is_active = false
shader_parameter/color = Vector3(0.95, 0.71, 0.01)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dn6sd"]
next_pass = SubResource("ShaderMaterial_r71lq")
@@ -41,6 +42,7 @@ uv1_scale = Vector3(0.5, 0.4, 1)
render_priority = 0
shader = ExtResource("7_gtq0i")
shader_parameter/is_active = false
shader_parameter/color = Vector3(0.95, 0.71, 0.01)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_uhv8u"]
next_pass = SubResource("ShaderMaterial_e7ek7")
@@ -52,6 +54,7 @@ normal_texture = ExtResource("6_r71lq")
render_priority = 0
shader = ExtResource("7_gtq0i")
shader_parameter/is_active = false
shader_parameter/color = Vector3(0.95, 0.71, 0.01)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rbvpf"]
next_pass = SubResource("ShaderMaterial_dn6sd")

29
Scenes/Prefabs/Shelf.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://c0gypplbklc3i"]
[gd_scene load_steps=13 format=3 uid="uid://c0gypplbklc3i"]
[ext_resource type="ArrayMesh" uid="uid://k2k1ppv3ycsv" path="res://Blends/Shelf/Shelf.obj" id="1_usf1u"]
[ext_resource type="Script" uid="uid://c61rr6to3q566" path="res://Scripts/build_object.gd" id="1_ya6sq"]
@@ -6,6 +6,7 @@
[ext_resource type="Texture2D" uid="uid://5gmmgg4cmefr" path="res://Blends/Shelf/color.png" id="2_x70sl"]
[ext_resource type="Texture2D" uid="uid://q0duenho1u2x" path="res://Blends/Shelf/normal.png" id="3_ya6sq"]
[ext_resource type="Shader" uid="uid://c08eg1piwoy3t" path="res://Shaders/outline.gdshader" id="5_jbe2f"]
[ext_resource type="Script" uid="uid://dw0nntbakhny6" path="res://Scripts/objects/shelf_object.gd" id="7_4318v"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_4318v"]
render_priority = 0
@@ -16,6 +17,7 @@ shader_parameter/color = Vector3(0, 0, 0)
render_priority = 0
shader = ExtResource("5_jbe2f")
shader_parameter/is_active = false
shader_parameter/color = Vector3(0.95, 0.71, 0.01)
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_jbe2f"]
next_pass = SubResource("ShaderMaterial_0dtcx")
@@ -27,10 +29,14 @@ normal_texture = ExtResource("3_ya6sq")
[sub_resource type="BoxShape3D" id="BoxShape3D_jbe2f"]
size = Vector3(4.40356, 3.34375, 1.28992)
[node name="Shelf" type="Node3D" node_paths=PackedStringArray("meshInstance")]
[sub_resource type="SphereShape3D" id="SphereShape3D_jbe2f"]
radius = 0.870929
[node name="Shelf" type="Node3D" node_paths=PackedStringArray("meshInstance", "ActionNode")]
script = ExtResource("1_ya6sq")
meshInstance = NodePath("Shelf")
preview_shader = SubResource("ShaderMaterial_4318v")
ActionNode = NodePath("ActionNode")
[node name="Shelf" type="MeshInstance3D" parent="."]
transform = Transform3D(-2.18557e-08, 0, -0.5, 0, 0.5, 0, 0.5, 0, -2.18557e-08, 0, -1.53245, 0)
@@ -38,7 +44,26 @@ mesh = ExtResource("1_usf1u")
surface_material_override/0 = SubResource("StandardMaterial3D_jbe2f")
[node name="StaticBody3D" type="StaticBody3D" parent="."]
input_ray_pickable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0545654, 0.0981445, -0.0205688)
shape = SubResource("BoxShape3D_jbe2f")
[node name="ActionNode" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.39139)
script = ExtResource("7_4318v")
[node name="Area3d" type="Area3D" parent="ActionNode"]
input_ray_pickable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="ActionNode/Area3d"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.839141, 0.470829)
shape = SubResource("SphereShape3D_jbe2f")
[node name="CSGSphere3D" type="CSGSphere3D" parent="ActionNode/Area3d"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.839141, 0.470829)
visible = false
radius = 0.886475
[connection signal="ready" from="ActionNode" to="ActionNode" method="_on_ready"]

19
Scenes/Prefabs/cart.tscn
View File

@@ -8,15 +8,15 @@
[ext_resource type="Shader" uid="uid://bfv6ckihralab" path="res://Shaders/build_transparent.gdshader" id="6_ru0md"]
[sub_resource type="NavigationMesh" id="NavigationMesh_ru0md"]
vertices = PackedVector3Array(-8.52442, 3.10583, -1.86593, -8.52442, 3.10583, -0.615934, -3.27442, 3.10583, -0.615934, -3.27442, 3.10583, -1.86593, -2.27442, 0.105834, 0.884066, -9.27442, 0.105834, 0.884066, -9.27442, 0.105834, 3.13407, 11.4756, 0.105834, 3.13407, 11.4756, 0.105834, -1.86593, -1.77442, 0.105834, -1.86593, -1.77442, 0.105834, 0.384066, -8.27442, 0.105834, -1.61593, -8.27442, 0.105834, -0.865934, -3.52442, 0.105834, -0.865934, -3.52442, 0.105834, -1.61593)
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1), PackedInt32Array(5, 4, 6), PackedInt32Array(6, 4, 7), PackedInt32Array(10, 9, 8), PackedInt32Array(10, 8, 4), PackedInt32Array(4, 8, 7), PackedInt32Array(14, 13, 11), PackedInt32Array(11, 13, 12)]
vertices = PackedVector3Array(-8.52442, 1.10583, -1.86593, -8.52442, 1.10583, -0.615934, -3.27442, 1.10583, -0.615934, -3.27442, 1.10583, -1.86593, -2.27442, 0.105834, 0.884066, -9.27442, 0.105834, 0.884066, -9.27442, 0.105834, 3.13407, 11.4756, 0.105834, 3.13407, 11.4756, 0.105834, -1.86593, -1.77442, 0.105834, -1.86593, -1.77442, 0.105834, 0.384066)
polygons = [PackedInt32Array(3, 2, 0), PackedInt32Array(0, 2, 1), PackedInt32Array(5, 4, 6), PackedInt32Array(6, 4, 7), PackedInt32Array(10, 9, 8), PackedInt32Array(10, 8, 4), PackedInt32Array(4, 8, 7)]
agent_radius = 0.7
[sub_resource type="BoxShape3D" id="BoxShape3D_u7bw1"]
size = Vector3(22.1814, 0.0957031, 5.72699)
[sub_resource type="BoxShape3D" id="BoxShape3D_ru0md"]
size = Vector3(6.47229, 3.39474, 2.33685)
size = Vector3(6.47229, 1.38536, 2.33685)
[sub_resource type="BoxShape3D" id="BoxShape3D_esjgi"]
size = Vector3(22.2341, 4.23804, 0.494629)
@@ -54,11 +54,13 @@ height = 0.1
affect_navigation_mesh = true
[node name="StaticBody3D" type="StaticBody3D" parent="Cart-bottom/NavigationRegion3D/NavigationObstacle3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.50052, -0.0203562, -1.1511)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.50052, -0.0203562, -20.5103)
collision_layer = 4
collision_mask = 4
input_ray_pickable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="Cart-bottom/NavigationRegion3D/NavigationObstacle3D/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.352722, 1.07356, -0.102142)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.352722, 0.0688691, -0.102142)
shape = SubResource("BoxShape3D_ru0md")
[node name="Wheels2" type="MeshInstance3D" parent="."]
@@ -86,26 +88,22 @@ visible = false
mesh = ExtResource("3_2wj72")
[node name="BlockBuildingArea" type="StaticBody3D" parent="."]
visible = false
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.137932, 0)
[node name="CollisionShape3D4" type="CollisionShape3D" parent="BlockBuildingArea"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 11.1878, 1.59147, -0.622702)
visible = false
shape = SubResource("BoxShape3D_esjgi")
[node name="CollisionShape3D3" type="CollisionShape3D" parent="BlockBuildingArea"]
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -10.6143, 1.63224, 0.537586)
visible = false
shape = SubResource("BoxShape3D_esjgi")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="BlockBuildingArea"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.619003, 1.50816, 3.83996)
visible = false
shape = SubResource("BoxShape3D_esjgi")
[node name="CollisionShape3D" type="CollisionShape3D" parent="BlockBuildingArea"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.282789, 1.61902, -2.6054)
visible = false
shape = SubResource("BoxShape3D_esjgi")
[node name="BuildingArea" type="StaticBody3D" parent="." node_paths=PackedStringArray("buildTransparentPreivew")]
@@ -116,6 +114,7 @@ metadata/is_building_area = true
[node name="smallBuildingArea2" type="CollisionShape3D" parent="BuildingArea"]
shape = SubResource("BoxShape3D_eosii")
debug_color = Color(0.981345, 0, 0.371873, 0.42)
metadata/is_building_area = true
[node name="BuildAreaModeView" type="MeshInstance3D" parent="BuildingArea"]

4
Scenes/Prefabs/food_item.tscn
View File

@@ -1,12 +1,12 @@
[gd_scene load_steps=4 format=3 uid="uid://d3l2w1076ttb0"]
[ext_resource type="PackedScene" uid="uid://tedmijw81j46" path="res://Blends/Items/Food/food.gltf" id="1_613iy"]
[ext_resource type="Script" uid="uid://c1ic8jloyqlnt" path="res://Scenes/Prefabs/Item.gd" id="2_qhaka"]
[ext_resource type="Script" uid="uid://bd3vhk86ac1nu" path="res://Scripts/Items/food_item.gd" id="2_cemcp"]
[ext_resource type="Material" uid="uid://detpb4ww2vvsf" path="res://Blends/Items/Food/Material.tres" id="3_cemcp"]
[node name="food" instance=ExtResource("1_613iy")]
transform = Transform3D(0.3, -1.53807e-05, 1.30802e-05, 1.53807e-05, 0.3, -5.5671e-06, -1.30802e-05, 5.5671e-06, 0.3, 0, 0, 0)
script = ExtResource("2_qhaka")
script = ExtResource("2_cemcp")
[node name="Cube" parent="." index="0"]
surface_material_override/0 = ExtResource("3_cemcp")

1
Scenes/main.tscn
View File

@@ -81,6 +81,7 @@ process_material = SubResource("ParticleProcessMaterial_21xkr")
draw_pass_1 = SubResource("QuadMesh_21xkr")
[node name="SpotLight3D" type="SpotLight3D" parent="."]
process_mode = 4
transform = Transform3D(1, 0, 0, 0, 0.64431, 0.764764, 0, -0.764764, 0.64431, -14.3055, 3.48611, -59.8356)
light_energy = 1.162
spot_range = 23.417