end turn update

Scenes/AI.tscn

@@ -0,0 +1,7 @@
+[gd_scene load_steps=3 format=3 uid="uid://bueqdw22nl501"]
+
+[ext_resource type="PackedScene" uid="uid://c7t8himcaqljg" path="res://Blends/Person/person2.gltf" id="1_y8wit"]
+[ext_resource type="Script" uid="uid://b3rkpiosqgfdi" path="res://Scripts/ai.gd" id="2_wxquw"]
+
+[node name="person2" instance=ExtResource("1_y8wit")]
+script = ExtResource("2_wxquw")

Scenes/bullet.tscn

@@ -1,10 +1,21 @@
-[gd_scene load_steps=3 format=3 uid="uid://j06vthscroca"]
+[gd_scene load_steps=4 format=3 uid="uid://j06vthscroca"]
 
 [ext_resource type="PackedScene" uid="uid://bm80w1xsgge1i" path="res://Blends/Bullet/bullet.gltf" id="1_xjght"]
 [ext_resource type="Script" uid="uid://bckkey7836cjp" path="res://Scripts/bullet.gd" id="2_oduel"]
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_oduel"]
+size = Vector3(0.039157, 0.0783691, 0.0383301)
+
 [node name="bullet" instance=ExtResource("1_xjght")]
 script = ExtResource("2_oduel")
 
 [node name="Cylinder" parent="." index="0"]
 transform = Transform3D(0.02, 0, 0, 0, 0.02, 0, 0, 0, 0.02, 0, 0, 0)
+
+[node name="StaticBody3D" type="StaticBody3D" parent="." index="1"]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" index="0"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00286226, 0.00549316, 0.000634715)
+shape = SubResource("BoxShape3D_oduel")
+
+[connection signal="input_event" from="StaticBody3D" to="." method="_on_static_body_3d_input_event"]

Scenes/main.tscn

@@ -1,10 +1,10 @@
 [gd_scene load_steps=6 format=3 uid="uid://b4ot3p50x08po"]
 
 [ext_resource type="PackedScene" uid="uid://cuqeg7u667dw6" path="res://Blends/Room/room.gltf" id="1_jjgbg"]
-[ext_resource type="PackedScene" uid="uid://c7t8himcaqljg" path="res://Blends/Person/person2.gltf" id="2_bo1nx"]
 [ext_resource type="PackedScene" uid="uid://j06vthscroca" path="res://Scenes/bullet.tscn" id="3_8gbba"]
 [ext_resource type="PackedScene" uid="uid://bge7npb7b1y6x" path="res://Scenes/revolver.tscn" id="4_jjvhh"]
 [ext_resource type="Script" uid="uid://dcmqt4341kxem" path="res://Scripts/bullet_stack.gd" id="4_kry3j"]
+[ext_resource type="PackedScene" uid="uid://bueqdw22nl501" path="res://Scenes/AI.tscn" id="5_kry3j"]
 
 [node name="Node3D" type="Node3D"]
 
@@ -15,28 +15,42 @@ transform = Transform3D(1, 0, 0, 0, 0.960866, 0.277013, 0, -0.277013, 0.960866,
 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)
 spot_range = 4.8595
 spot_angle = 42.0126
 
-[node name="person2" parent="." instance=ExtResource("2_bo1nx")]
-transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.0599972, 3.68584, -2.25251)
-
 [node name="revolver" parent="." instance=ExtResource("4_jjvhh")]
 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="bullet2" parent="BulletStack" instance=ExtResource("3_8gbba")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0812991, -0.0193229, 0.00827265)
+
 [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)
 
+[node name="bullet3" parent="BulletStack" instance=ExtResource("3_8gbba")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.172968, -0.0193229, 0.0478075)
+
+[node name="bullet4" parent="BulletStack" instance=ExtResource("3_8gbba")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.20906, -0.0193229, 0.168294)
+
+[node name="bullet5" parent="BulletStack" instance=ExtResource("3_8gbba")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.126874, -0.00966144, 0.164157)
+
+[node name="bullet6" parent="BulletStack" instance=ExtResource("3_8gbba")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.300729, -0.0193229, 0.207828)
+
+[node name="person3" parent="." instance=ExtResource("5_kry3j")]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.0599972, 3.68584, -2.25251)
+
+[node name="enemy_revolver" parent="." instance=ExtResource("4_jjvhh")]
+transform = Transform3D(0.1, 0, 0, 0, -0.1, -8.74228e-09, 0, 8.74228e-09, -0.1, 0.354285, 4.2476, -0.496572)
+
 [editable path="revolver"]

Scripts/ai.gd

@@ -0,0 +1,23 @@
+extends Node3D
+
+var revolver: Node3D
+
+func _ready() -> void:
+	revolver = GameManager.get_enemy_revolver()
+	GameManager.state_changed.connect(on_state_changed)
+
+func on_state_changed():
+	if GameManager.current_state == GameManager.GameState.PLAYER2_GUN_LOAD:
+		make_turn()
+
+func make_turn():
+	if revolver == null:
+		revolver = GameManager.get_enemy_revolver()
+	var bullets = GameManager.bullets
+	var avaible_bullets = Array()
+	for bullet in bullets:
+		if bullet.is_loaded == false:
+			avaible_bullets.append(bullet)
+	var randNumb = randi_range(0, avaible_bullets.size() -1)
+	revolver.load_bullet(avaible_bullets[randNumb])
+	

Scripts/ai.gd.uid

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

Scripts/bullet.gd

@@ -4,11 +4,13 @@ signal destination_reached
 
 
 var is_live: bool = false
+var is_loaded: bool = false
 var is_target_reached: bool = true
 
 var target_position: Vector3
 
 func _ready() -> void:
+	GameManager.add_bullet(self)
 	target_position = Vector3.ZERO
 	destination_reached.connect(on_target_reached)
 
@@ -27,3 +29,8 @@ func moveTo(target_pos: Vector3):
 func on_target_reached():
 	print("Target Reached")
 	is_target_reached = true
+
+
+func _on_static_body_3d_input_event(camera: Node, event: InputEvent, event_position: Vector3, normal: Vector3, shape_idx: int) -> void:
+	if event.is_action_released("left_mouse_click"):
+		GameManager.bullet_selected.emit(self)

Scripts/bullet_stack.gd

@@ -10,7 +10,7 @@ var v_offset: float = 0.1
 
 func _ready() -> void:
 	GameManager.set_bullet_stack(self)
-	generate_bullet_stack()
+	#generate_bullet_stack()
 
 func generate_bullet_stack():
 	for i in range(1, 22, 1):
@@ -18,3 +18,6 @@ func generate_bullet_stack():
 		newBullet.position = Vector3(i*h_offset,0,0)
 		bullets.append(newBullet)
 		add_child(newBullet)
+
+func add_bullets():
+	pass

Scripts/game_manager.gd

@@ -1,5 +1,11 @@
 extends Node
 
+
+signal bullet_selected(object)
+signal state_changed
+
+enum  GameState { PLAYER1_GUN_LOAD, PLAYER2_GUN_LOAD, GUN_ANIMATION, PLAYER1_UNLOAD,PLAYER2_UNLOAD}
+var current_state = GameState.PLAYER1_GUN_LOAD
 var bullets: Array
 
 var player1_revolver: Node3D
@@ -7,7 +13,7 @@ var player2_revolver: Node3D
 var bullet_stack: Node3D
 
 func _ready() -> void:
-	bullets.resize(21)
+	bullet_selected.connect(on_bullet_selected)
 
 func _input(event: InputEvent) -> void:
 	if event.is_action_released("load"):
@@ -22,5 +28,43 @@ func set_enemy_revolver(newRevolver):
 func set_bullet_stack(newStack):
 	bullet_stack = newStack
 
-func add_bullet():
+func add_bullet(bullet):
-	pass
+	bullets.append(bullet)
+
+
+func on_bullet_selected(bullet_object: Node3D):
+	if current_state == GameState.PLAYER1_GUN_LOAD:
+		if bullet_object.is_loaded != true:
+			set_state(GameState.GUN_ANIMATION)
+			player1_revolver.load_bullet(bullet_object)
+
+func set_state(newState):
+	current_state = newState
+	state_changed.emit()
+
+func check_unloaded_bullets():
+	var unloaded_bullets = Array()
+	for bullet in bullets:
+		if bullet.is_loaded != true:
+			unloaded_bullets.append(bullet)
+	if unloaded_bullets.size() > 0:
+		return true
+	else: 
+		return false
+		
+	
+func end_player_turn():
+	if check_unloaded_bullets():	
+		set_state(GameState.PLAYER2_GUN_LOAD)
+	else:
+		set_state(GameState.PLAYER2_UNLOAD)
+		print("End of Phase 1")
+func end_enemy_turn():
+	if check_unloaded_bullets():
+		set_state(GameState.PLAYER1_GUN_LOAD)
+	else:
+		set_state(GameState.PLAYER1_UNLOAD)
+		print("End of Phase 1")
+func get_enemy_revolver() -> Node3D:
+	return player2_revolver
+	

Scripts/revolver.gd

@@ -12,7 +12,7 @@ var timer: Timer
 
 var is_cylinder_out: bool = false
 func _ready() -> void:
-	loaded_bullets.resize(6)
+	loaded_bullets.resize(max_bullets + 1)
 	timer = $Timer
 	if is_player_revolver:
 		GameManager.set_player_revolver(self)
@@ -29,18 +29,21 @@ func _process(delta: float) -> void:
 	#cylinder.rotation_degrees = Vector3(30 + current_round*60,90,90)
 func load_bullet(bullet_object: Node3D):
 	loaded_bullets[current_round] = bullet_object
+	bullet_object.is_loaded = true
 	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
-	
+	if is_player_revolver:
+		GameManager.end_player_turn()
+	else:
+		GameManager.end_enemy_turn()
 	timer.timeout.disconnect(on_load_anim_end)
 	
 func on_bullet_reached():

project.godot

@@ -31,3 +31,8 @@ load2={
 "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)
 ]
 }
+left_mouse_click={
+"deadzone": 0.2,
+"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":1,"position":Vector2(290, 15),"global_position":Vector2(299, 63),"factor":1.0,"button_index":1,"canceled":false,"pressed":true,"double_click":false,"script":null)
+]
+}