diff --git a/Nodes/Bin.tscn b/Nodes/Bin.tscn index fb841cc..e5782ae 100644 --- a/Nodes/Bin.tscn +++ b/Nodes/Bin.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://iuoepenpnktv"] +[gd_scene load_steps=4 format=3 uid="uid://bkpnrgcfr1jgl"] [ext_resource type="Texture2D" uid="uid://pwyskequsdls" path="res://bin.png" id="1_krl02"] [ext_resource type="Script" path="res://scripts/Modules/Bin.gd" id="1_saxpo"] diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index 9ed8643..d8d140f 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3 uid="uid://md2ofbviios3"] +[gd_scene load_steps=22 format=3 uid="uid://md2ofbviios3"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"] [ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="3_1ix85"] @@ -15,6 +15,7 @@ [ext_resource type="Texture2D" uid="uid://ctbxpx6p36bdi" path="res://walking_ball2.png" id="8_0u1e2"] [ext_resource type="Texture2D" uid="uid://ckdlv6b7okseq" path="res://walking_powder2.png" id="10_a137a"] [ext_resource type="Texture2D" uid="uid://b5ioch3ad8y6r" path="res://walking_coal2.png" id="11_1jgcf"] +[ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="16_q3kvk"] [sub_resource type="BoxShape3D" id="BoxShape3D_okaqh"] size = Vector3(1, 3.77669, 24) @@ -123,7 +124,17 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, 0.876562 currentType = 2 [node name="Cannon" parent="." instance=ExtResource("5_vgxqe")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.4817, 1.2303, 0.0486939) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.32927, 1.2303, 0.0486939) + +[node name="Cannon2" parent="." instance=ExtResource("5_vgxqe")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.38381, 1.2303, 5.95106) [node name="Engine" parent="." instance=ExtResource("3_1ix85")] transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, -3.45639, 1.1688, 9) + +[node name="Bin" parent="." instance=ExtResource("16_q3kvk")] +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.70291, -0.287106, 10.1948) + +[node name="Storage3" parent="." instance=ExtResource("4_5jw5g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.63306, -0.501894, -11.5457) +currentType = 1 diff --git a/Nodes/cannon.tscn b/Nodes/cannon.tscn index 79804ba..88ba1e5 100644 --- a/Nodes/cannon.tscn +++ b/Nodes/cannon.tscn @@ -1,16 +1,12 @@ -[gd_scene load_steps=4 format=3 uid="uid://byo1m0n20yl45"] +[gd_scene load_steps=3 format=3 uid="uid://byo1m0n20yl45"] [ext_resource type="Script" path="res://scripts/Modules/Cannon.gd" id="1_vdn0s"] -[sub_resource type="CylinderShape3D" id="CylinderShape3D_2geka"] - -[sub_resource type="CylinderMesh" id="CylinderMesh_g6oe4"] +[sub_resource type="BoxShape3D" id="BoxShape3D_sm3et"] +size = Vector3(3.10406, 3, 2) [node name="Cannon" type="StaticBody3D"] script = ExtResource("1_vdn0s") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -shape = SubResource("CylinderShape3D_2geka") - -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] -mesh = SubResource("CylinderMesh_g6oe4") +shape = SubResource("BoxShape3D_sm3et") diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 2aa1b2d..52e330d 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -42,7 +42,7 @@ near = 0.041 transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -10, 0, 0) [node name="Train2" parent="." instance=ExtResource("4_lmu0s")] -transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 10, 0, 0) +transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 9.90113, -0.0549407, -0.085681) [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(0.875944, -0.294781, 0.381872, -0.0210188, 0.767515, 0.640687, -0.481955, -0.569232, 0.666104, 0, 8.25958, 0) diff --git a/scripts/Modules/Bin.gd b/scripts/Modules/Bin.gd index 973f149..d4c5dcc 100644 --- a/scripts/Modules/Bin.gd +++ b/scripts/Modules/Bin.gd @@ -6,4 +6,4 @@ class_name Bin #------------Methods-------------# func interact(player): - player.inventory = 0 + player.clearInventory()