diff --git a/Chest.png b/Chest.png new file mode 100644 index 0000000..696a3f3 Binary files /dev/null and b/Chest.png differ diff --git a/Chest.png.import b/Chest.png.import new file mode 100644 index 0000000..df3f87c --- /dev/null +++ b/Chest.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cjc4wohtjb73j" +path.s3tc="res://.godot/imported/Chest.png-017d8397062a17fb93a3b0c3debc27a2.s3tc.ctex" +path.etc2="res://.godot/imported/Chest.png-017d8397062a17fb93a3b0c3debc27a2.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://Chest.png" +dest_files=["res://.godot/imported/Chest.png-017d8397062a17fb93a3b0c3debc27a2.s3tc.ctex", "res://.godot/imported/Chest.png-017d8397062a17fb93a3b0c3debc27a2.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +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=0 diff --git a/Nodes/Player.tscn b/Nodes/Player.tscn index 43bd028..152cb4d 100644 --- a/Nodes/Player.tscn +++ b/Nodes/Player.tscn @@ -24,7 +24,8 @@ radius = 0.500599 height = 1.99403 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ndwdl"] -radius = 0.567567 +radius = 1.26679 +height = 2.53358 [node name="CharacterBody3D" type="CharacterBody3D"] script = ExtResource("1_dta8q") @@ -42,7 +43,6 @@ visible = false texture = ExtResource("2_yjfj7") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -visible = false shape = SubResource("CapsuleShape3D_p76ml") [node name="HitBox" type="Area3D" parent="."] diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 20c50df..c46b949 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,10 +1,11 @@ -[gd_scene load_steps=9 format=3 uid="uid://cp2itfdd21cg2"] +[gd_scene load_steps=10 format=3 uid="uid://cp2itfdd21cg2"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="2_61aog"] [ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="2_vrf6k"] [ext_resource type="Script" path="res://scripts/Train.gd" id="2_xl0he"] [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="4_1ipcp"] +[ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="6_8ef51"] [sub_resource type="BoxMesh" id="BoxMesh_ognqx"] size = Vector3(13, 1, 25) @@ -43,6 +44,9 @@ transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, 0, 0) [node name="Cannon2" parent="Player1" instance=ExtResource("2_vrf6k")] +[node name="Storage" parent="Player1" instance=ExtResource("6_8ef51")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.84663, 0, 3.75554) + [node name="Player2" type="Node3D" parent="."] transform = Transform3D(0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, 12, 0, 0) script = ExtResource("2_xl0he") @@ -57,7 +61,6 @@ transform = Transform3D(1, 8.23952e-25, 0, -1.6479e-25, 1, 0, 0, -1.65436e-24, 1 shape = SubResource("ConcavePolygonShape3D_l76gd") [node name="CharacterBody3D" parent="Player2" instance=ExtResource("4_1ipcp")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 0, 0, 0) diff --git a/Storage.tscn b/Storage.tscn index 4828e40..5c9fce1 100644 --- a/Storage.tscn +++ b/Storage.tscn @@ -1,7 +1,19 @@ -[gd_scene load_steps=2 format=3 uid="uid://cet80w4yr8rse"] +[gd_scene load_steps=4 format=3 uid="uid://cet80w4yr8rse"] [ext_resource type="Script" path="res://scripts/Modules/Storage.gd" id="1_guwoh"] +[ext_resource type="Texture2D" uid="uid://cjc4wohtjb73j" path="res://Chest.png" id="2_a5kei"] -[node name="Storage" type="Node"] +[sub_resource type="CylinderShape3D" id="CylinderShape3D_c1ipa"] +height = 3.60519 +radius = 1.29067 + +[node name="Storage" type="StaticBody3D"] script = ExtResource("1_guwoh") currentType = 0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("CylinderShape3D_c1ipa") + +[node name="Sprite3D" type="Sprite3D" parent="."] +transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 2, 0) +texture = ExtResource("2_a5kei") diff --git a/project.godot b/project.godot index f9a62a0..3a8fb48 100644 --- a/project.godot +++ b/project.godot @@ -24,7 +24,7 @@ _global_script_classes=[{ "language": &"GDScript", "path": "res://scripts/Logic/MapNode.gd" }, { -"base": "Node", +"base": "StaticBody3D", "class": &"Module", "language": &"GDScript", "path": "res://scripts/Modules/Module.gd" diff --git a/scripts/Modules/Module.gd b/scripts/Modules/Module.gd index ca86d7d..8c2fc80 100644 --- a/scripts/Modules/Module.gd +++ b/scripts/Modules/Module.gd @@ -1,4 +1,4 @@ -extends Node +extends StaticBody3D class_name Module #-----------Parameters----------------'