Finished basic PickupableItem

This commit is contained in:
Alexey 2025-08-01 13:11:26 +03:00
commit 88c56f8aed
21 changed files with 163 additions and 35 deletions

View file

@ -1,8 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://d23028pr0jahr"]
[gd_scene load_steps=3 format=3 uid="uid://d23028pr0jahr"]
[ext_resource type="PackedScene" uid="uid://bgnb01j1nphhi" path="res://base/scenes/rooms/test.tscn" id="1_sjeh3"]
[ext_resource type="PackedScene" uid="uid://dwx5tcatj35gu" path="res://base/scenes/player.tscn" id="2_uxs03"]
[ext_resource type="PackedScene" uid="uid://twqkevpn0q1a" path="res://base/scenes/enemies/test_enemy.tscn" id="3_tk4w0"]
[node name="Game" type="Node3D"]
@ -11,6 +10,3 @@
[node name="Player" parent="." instance=ExtResource("2_uxs03")]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.208048, 1.61008)
[node name="TestEnemy" parent="." instance=ExtResource("3_tk4w0")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.695979)

View file

@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=3 uid="uid://ddjjrkernsobh"]
[ext_resource type="Texture2D" uid="uid://bdgoa18kfhlwo" path="res://base/assets/sprites/interactive/interactive.png" id="1_yf10f"]
[ext_resource type="Script" uid="uid://fva8kqc3mk86" path="res://base/scripts/interactive_object.gd" id="2_cdwk3"]
[ext_resource type="Script" uid="uid://junnt60g6c7x" path="res://base/scripts/interactive/interactive_object.gd" id="2_cdwk3"]
[sub_resource type="SphereShape3D" id="SphereShape3D_cdwk3"]
@ -11,8 +11,11 @@ billboard = 1
texture_filter = 0
texture = ExtResource("1_yf10f")
script = ExtResource("2_cdwk3")
metadata/_custom_type_script = "uid://junnt60g6c7x"
[node name="Area3D" type="Area3D" parent="."]
collision_layer = 16
collision_mask = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
shape = SubResource("SphereShape3D_cdwk3")

View file

@ -13,6 +13,8 @@ texture = ExtResource("1_2373a")
script = ExtResource("2_2373a")
[node name="Area3D" type="Area3D" parent="."]
collision_layer = 16
collision_mask = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
shape = SubResource("SphereShape3D_cdwk3")

View file

@ -1,11 +1,10 @@
[gd_scene load_steps=12 format=3 uid="uid://dwx5tcatj35gu"]
[gd_scene load_steps=11 format=3 uid="uid://dwx5tcatj35gu"]
[ext_resource type="Script" uid="uid://dts8lbivkgsmj" path="res://base/scripts/player/player.gd" id="1_1w3ab"]
[ext_resource type="Texture2D" uid="uid://cf7avgppv4kfk" path="res://base/assets/sprites/guns/placeholder/static.png" id="2_gt0rj"]
[ext_resource type="PackedScene" uid="uid://bb6ovrbusyxpi" path="res://base/scenes/weapons/weapon_base.tscn" id="2_ma1q3"]
[ext_resource type="Script" uid="uid://byhp4pklbjltn" path="res://base/scripts/player/weapon_container.gd" id="3_1w3ab"]
[ext_resource type="Script" uid="uid://diu6eno2ag6ga" path="res://base/scripts/player/weapon_slot.gd" id="4_gt0rj"]
[ext_resource type="PackedScene" uid="uid://cig5dryfni4f8" path="res://base/scenes/weapons/auto_weapon_test.tscn" id="6_gt0rj"]
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_jjqxs"]
@ -67,7 +66,7 @@ _data = {
[node name="Player" type="CharacterBody3D"]
collision_layer = 2
collision_mask = 3
collision_mask = 19
platform_wall_layers = 1
script = ExtResource("1_1w3ab")
@ -120,8 +119,6 @@ metadata/_custom_type_script = "uid://diu6eno2ag6ga"
script = ExtResource("4_gt0rj")
metadata/_custom_type_script = "uid://diu6eno2ag6ga"
[node name="Weapon" parent="WeaponContainer/Secondary" instance=ExtResource("6_gt0rj")]
[node name="Tertiary" type="Node3D" parent="WeaponContainer"]
script = ExtResource("4_gt0rj")
metadata/_custom_type_script = "uid://diu6eno2ag6ga"

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=3 format=3 uid="uid://bgnb01j1nphhi"]
[gd_scene load_steps=4 format=3 uid="uid://bgnb01j1nphhi"]
[ext_resource type="PackedScene" uid="uid://c4wpq5gxkbor7" path="res://base/scenes/interactive/pickupable_item.tscn" id="1_1whpt"]
[ext_resource type="Resource" uid="uid://b1pqbhcv5ixmy" path="res://base/assets/resources/items/weapon_base.tres" id="2_ayew2"]
[ext_resource type="Resource" uid="uid://cdsrjmq8xd5b0" path="res://base/assets/resources/items/auto_weapon.tres" id="3_npgpc"]
[node name="Test Room" type="Node3D"]
@ -51,4 +52,8 @@ content = ExtResource("2_ayew2")
[node name="PickupableItem2" parent="." instance=ExtResource("1_1whpt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.700438, -0.47008, -0.800458)
content = ExtResource("3_npgpc")
[node name="PickupableItem3" parent="." instance=ExtResource("1_1whpt")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.10903, -0.47008, 1.99618)
content = ExtResource("2_ayew2")