added loading of bullets

Scenes/main.tscn

@@ -13,7 +13,9 @@
 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 0.960866, 0.277013, 0, -0.277013, 0.960866, 0.416753, 5.34576, 3.16175)
 h_offset = -0.33
+v_offset = -0.47
 current = true
+fov = 12.3
 
 [node name="SpotLight3D" type="SpotLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 6.13189, 0)
@@ -27,9 +29,14 @@ transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.0599
 transform = Transform3D(-0.1, -8.74228e-09, 0, 8.74228e-09, -0.1, 0, 0, 0, 0.1, 0.354285, 4.2476, 0.425178)
 is_player_revolver = true
 
+[node name="Cylinder_002" parent="revolver" index="1"]
+transform = Transform3D(0.388665, 1.69891e-08, 0.673188, 0.673188, -2.9426e-08, -0.388665, 1.69891e-08, 0.77733, -2.9426e-08, 0.0429976, 0.542699, 3.97893)
+
 [node name="BulletStack" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.09463, 3.35364, -0.941887)
 script = ExtResource("4_kry3j")
 
 [node name="bullet" parent="BulletStack" instance=ExtResource("3_8gbba")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000887632, -0.00966144, 0.00413632)
+
+[editable path="revolver"]

Scenes/revolver.tscn

@@ -16,3 +16,6 @@ transform = Transform3D(0.388665, 1.69891e-08, 0.673188, 0.673188, -2.9426e-08,
 
 [node name="Cube_002" parent="." index="4"]
 transform = Transform3D(-4.37114e-08, 0, 0.564469, 0, 0.0715409, 0, -1, 0, -2.46737e-08, 0, -0.305258, 3.93692)
+
+[node name="Timer" type="Timer" parent="." index="5"]
+one_shot = true

Scripts/bullet.gd

@@ -13,9 +13,11 @@ func _ready() -> void:
 	destination_reached.connect(on_target_reached)
 
 func _process(delta: float) -> void:
-	if !is_target_reached:
+	if is_target_reached == false:
 		self.global_position = lerp(global_position, target_position, delta / 0.1)
-	if (global_position.length() - target_position.length() ) == 0.0:
+		
+	if global_position.distance_to(target_position) < 0.1/1000 and is_target_reached == false:
+		
 		destination_reached.emit()
 
 func moveTo(target_pos: Vector3):
@@ -23,4 +25,5 @@ func moveTo(target_pos: Vector3):
 	is_target_reached = false
 
 func on_target_reached():
+	print("Target Reached")
 	is_target_reached = true

Scripts/game_manager.gd

@@ -12,6 +12,8 @@ func _ready() -> void:
 func _input(event: InputEvent) -> void:
 	if event.is_action_released("load"):
 		player1_revolver.load_bullet(bullet_stack.bullets[0])
+	elif event.is_action_released("load2"):
+		player1_revolver.load_bullet(bullet_stack.bullets[1])
 
 func set_player_revolver(newRevolver):
 	player1_revolver = newRevolver

Scripts/revolver.gd

@@ -1,17 +1,19 @@
 extends Node3D
 
-var bullet_target_pos = Vector3(2.231,0.03,4.612)
+var bullet_target_pos = Vector3(1.95,0.03,4.612) #2.231
 
 var loaded_bullets = Array()
 var max_bullets: int = 6
-var current_round: int = 0
-
+var current_round: int = 1
+var timer: Timer
 
 @export var is_player_revolver: bool = false
 @export var cylinder: Node3D
 
 var is_cylinder_out: bool = false
 func _ready() -> void:
+	loaded_bullets.resize(6)
+	timer = $Timer
 	if is_player_revolver:
 		GameManager.set_player_revolver(self)
 	else:
@@ -22,8 +24,27 @@ func _process(delta: float) -> void:
 		cylinder.position = lerp(cylinder.position, Vector3(1.947,0.543,3.979), delta/ 0.1)
 	else:
 		cylinder.position = lerp(cylinder.position, Vector3(0,0.543,3.979), delta/ 0.1)
-func load_bullet(bullet_object):
+
+	cylinder.rotation_degrees = lerp(cylinder.rotation_degrees,Vector3(30 + current_round*60,90,90), delta / 0.1 )
+	#cylinder.rotation_degrees = Vector3(30 + current_round*60,90,90)
+func load_bullet(bullet_object: Node3D):
+	loaded_bullets[current_round] = bullet_object
+	bullet_object.destination_reached.connect(on_bullet_reached)
 	bullet_object.moveTo(to_global(bullet_target_pos)) 
+	bullet_object.rotate_x(deg_to_rad(-90))
 	is_cylinder_out = true
+	bullet_object.reparent(cylinder)
+	print_tree()
+	timer.timeout.connect(on_load_anim_end)
+	#cylinder.rotation.x = 90.0
+	
+func on_load_anim_end():
+	is_cylinder_out = false
+	
+	timer.timeout.disconnect(on_load_anim_end)
+	
+func on_bullet_reached():
+	current_round += 1
+	timer.start()
 func shoot():
 	pass

project.godot

@@ -26,3 +26,8 @@ load={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
 ]
 }
+load2={
+"deadzone": 0.2,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
+]
+}