test coin animation

Blends/Coin/coin.blend.import

@@ -0,0 +1,53 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://lips2cgpmr8b"
+path="res://.godot/imported/coin.blend-26f8edf08583f0fed81637dbe6ec82c6.scn"
+
+[deps]
+
+source_file="res://Blends/Coin/coin.blend"
+dest_files=["res://.godot/imported/coin.blend-26f8edf08583f0fed81637dbe6ec82c6.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+blender/nodes/visible=0
+blender/nodes/active_collection_only=false
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/colors=false
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/export_geometry_nodes_instances=false
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true

Blends/Coin/coin.gltf

@@ -0,0 +1,205 @@
+{
+	"asset":{
+		"generator":"Khronos glTF Blender I/O v4.5.47",
+		"version":"2.0"
+	},
+	"scene":0,
+	"scenes":[
+		{
+			"name":"Scene",
+			"nodes":[
+				0
+			]
+		}
+	],
+	"nodes":[
+		{
+			"mesh":0,
+			"name":"Cylinder",
+			"scale":[
+				0.16937243938446045,
+				0.011989540420472622,
+				0.16937243938446045
+			]
+		}
+	],
+	"materials":[
+		{
+			"doubleSided":true,
+			"name":"Material.001",
+			"pbrMetallicRoughness":{
+				"baseColorFactor":[
+					0.8003232479095459,
+					0.7214018106460571,
+					0.048716265708208084,
+					1
+				],
+				"roughnessFactor":0.2857142686843872
+			}
+		},
+		{
+			"doubleSided":true,
+			"name":"Material.002",
+			"pbrMetallicRoughness":{
+				"baseColorFactor":[
+					1,
+					0.012268719263374805,
+					0.0156707726418972,
+					1
+				],
+				"roughnessFactor":0.3095238208770752
+			}
+		}
+	],
+	"meshes":[
+		{
+			"name":"Cylinder",
+			"primitives":[
+				{
+					"attributes":{
+						"POSITION":0,
+						"NORMAL":1,
+						"TEXCOORD_0":2
+					},
+					"indices":3,
+					"material":0
+				},
+				{
+					"attributes":{
+						"POSITION":4,
+						"NORMAL":5,
+						"TEXCOORD_0":6
+					},
+					"indices":7,
+					"material":1
+				}
+			]
+		}
+	],
+	"accessors":[
+		{
+			"bufferView":0,
+			"componentType":5126,
+			"count":580,
+			"max":[
+				1,
+				1,
+				1
+			],
+			"min":[
+				-1,
+				-1,
+				-1
+			],
+			"type":"VEC3"
+		},
+		{
+			"bufferView":1,
+			"componentType":5126,
+			"count":580,
+			"type":"VEC3"
+		},
+		{
+			"bufferView":2,
+			"componentType":5126,
+			"count":580,
+			"type":"VEC2"
+		},
+		{
+			"bufferView":3,
+			"componentType":5123,
+			"count":1140,
+			"type":"SCALAR"
+		},
+		{
+			"bufferView":4,
+			"componentType":5126,
+			"count":18978,
+			"max":[
+				0.8202698230743408,
+				1.6481459140777588,
+				0.4704993665218353
+			],
+			"min":[
+				-0.7866606712341309,
+				-1.5491652488708496,
+				-0.7433416843414307
+			],
+			"type":"VEC3"
+		},
+		{
+			"bufferView":5,
+			"componentType":5126,
+			"count":18978,
+			"type":"VEC3"
+		},
+		{
+			"bufferView":6,
+			"componentType":5126,
+			"count":18978,
+			"type":"VEC2"
+		},
+		{
+			"bufferView":7,
+			"componentType":5123,
+			"count":75216,
+			"type":"SCALAR"
+		}
+	],
+	"bufferViews":[
+		{
+			"buffer":0,
+			"byteLength":6960,
+			"byteOffset":0,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":6960,
+			"byteOffset":6960,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":4640,
+			"byteOffset":13920,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":2280,
+			"byteOffset":18560,
+			"target":34963
+		},
+		{
+			"buffer":0,
+			"byteLength":227736,
+			"byteOffset":20840,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":227736,
+			"byteOffset":248576,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":151824,
+			"byteOffset":476312,
+			"target":34962
+		},
+		{
+			"buffer":0,
+			"byteLength":150432,
+			"byteOffset":628136,
+			"target":34963
+		}
+	],
+	"buffers":[
+		{
+			"byteLength":778568,
+			"uri":"coin.bin"
+		}
+	]
+}

Blends/Coin/coin.gltf.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bah3dldj3s48g"
+path="res://.godot/imported/coin.gltf-714424d1598d1074dffd6ddc1f2a93ca.scn"
+
+[deps]
+
+source_file="res://Blends/Coin/coin.gltf"
+dest_files=["res://.godot/imported/coin.gltf-714424d1598d1074dffd6ddc1f2a93ca.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+nodes/use_node_type_suffixes=true
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+gltf/naming_version=1
+gltf/embedded_image_handling=1

Scenes/coin.tscn

@@ -0,0 +1,73 @@
+[gd_scene load_steps=5 format=3 uid="uid://7s0s5nac7psb"]
+
+[ext_resource type="PackedScene" uid="uid://bah3dldj3s48g" path="res://Blends/Coin/coin.gltf" id="1_2qo34"]
+
+[sub_resource type="Animation" id="Animation_2qo34"]
+resource_name = "coin_jump_1"
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Cylinder:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.1, 0.2008, 0.3008, 0.4008, 0.5008, 0.6008, 0.7008, 0.8008, 0.9, 1),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(0, 0, 0), Vector3(0, 0.175061, 0), Vector3(0, 0.368962, 0), Vector3(0, 0.610777, 0), Vector3(0, 0.967692, 0), Vector3(0, 1.4979, 0), Vector3(0, 1.89916, 0), Vector3(0, 2.23659, 0), Vector3(0, 2.95364, 0), Vector3(0, 3.47685, 0), Vector3(0, 0, 0)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Cylinder:rotation")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.1, 0.2008, 0.3008, 0.4008, 0.5008, 0.6008, 0.7008, 0.8008, 0.9, 1),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(0, 0, 0), Vector3(0.174533, 0, 0), Vector3(0.872665, 0, 0), Vector3(2.54818, 0, 0), Vector3(3.14159, 0, 0), Vector3(-2.39983, 0, 0), Vector3(-1.14319, 0, 0), Vector3(0.113446, 0, 0), Vector3(1.16064, 0, 0), Vector3(3.0456, 0, 0), Vector3(3.14159, 0, 0)]
+}
+
+[sub_resource type="Animation" id="Animation_jgi06"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Cylinder:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(0, 0, 0)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("Cylinder:rotation")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(0, 0, 0)]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_g537i"]
+_data = {
+&"RESET": SubResource("Animation_jgi06"),
+&"coin_jump_1": SubResource("Animation_2qo34")
+}
+
+[node name="coin" instance=ExtResource("1_2qo34")]
+
+[node name="Cylinder" parent="." index="0"]
+transform = Transform3D(0.169372, 0, 0, 0, 0.0119895, 0, 0, 0, 0.169372, 0, 0, 0)
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="1"]
+libraries = {
+&"": SubResource("AnimationLibrary_g537i")
+}

Scenes/main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=3 uid="uid://b4ot3p50x08po"]
+[gd_scene load_steps=14 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://j06vthscroca" path="res://Scenes/bullet.tscn" id="3_8gbba"]
@@ -61,6 +61,30 @@ tracks/1/keys = {
 "update": 0,
 "values": [Vector3(0, 0, 1.5708)]
 }
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("enemy_revolver:position")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(1.01994, 3.38413, -0.496572)]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("enemy_revolver:rotation")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(8.74064e-08, 3.14159, -1.59017)]
+}
 
 [sub_resource type="Animation" id="Animation_344ge"]
 resource_name = "player_revolver_down"
@@ -89,9 +113,65 @@ tracks/1/keys = {
 "values": [Vector3(0, 0, 3.14159), Vector3(0, 0, 1.5708)]
 }
 
+[sub_resource type="Animation" id="Animation_ynf5e"]
+resource_name = "enemey_rev_up"
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("enemy_revolver:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector3(1.01994, 3.38413, -0.496572), Vector3(-0.790087, 4.02359, -0.496572)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("enemy_revolver:rotation")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector3(8.74064e-08, 3.14159, -1.59017), Vector3(0, 3.14159, -3.14159)]
+}
+
+[sub_resource type="Animation" id="Animation_hptm8"]
+resource_name = "enemey_rev_down"
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("enemy_revolver:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector3(-0.790087, 4.02359, -0.496572), Vector3(1.01994, 3.38413, -0.496572)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("enemy_revolver:rotation")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0.0333334, 1),
+"transitions": PackedFloat32Array(1, 1),
+"update": 0,
+"values": [Vector3(0, 3.14159, -3.14159), Vector3(8.74064e-08, 3.14159, -1.59017)]
+}
+
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_344ge"]
 _data = {
 &"RESET": SubResource("Animation_6bp64"),
+&"enemey_rev_down": SubResource("Animation_hptm8"),
+&"enemey_rev_up": SubResource("Animation_ynf5e"),
 &"player_revolver_down": SubResource("Animation_344ge"),
 &"player_revolver_up": SubResource("Animation_21xkr")
 }
@@ -113,8 +193,6 @@ spot_angle = 42.0126
 
 [node name="revolver" parent="." instance=ExtResource("4_jjvhh")]
 transform = Transform3D(-4.37114e-09, -0.1, 0, 0.1, -4.37114e-09, 0, 0, 0, 0.1, 1.02871, 3.34454, 0.425178)
-down_pos = Vector3(1.029, 3.345, 0.425)
-target_angle_up = Vector3(0, 0, -180)
 is_player_revolver = true
 
 [node name="BulletStack" type="Node3D" parent="."]
@@ -164,11 +242,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.162003, -0.0193229, 0.0082
 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.00193718, -0.0999812, 1.69355e-10, -0.0999812, -0.00193718, -8.74064e-09, 8.74228e-09, -7.64274e-16, -0.1, 1.01994, 3.38413, -0.496572)
+transform = Transform3D(0.00193719, -0.0999812, 1.50996e-08, -0.0999812, -0.00193719, -8.74064e-09, 9.0315e-09, -1.49274e-08, -0.1, 1.01994, 3.38413, -0.496572)
-up_pos = Vector3(0.354, 4.248, -0.497)
-down_pos = Vector3(1.02, 3.384, -0.497)
-target_angle_up = Vector3(0, -180, 180)
-target_angle_down = Vector3(0, 180, -90)
 
 [node name="MainGame" parent="." instance=ExtResource("6_21xkr")]
 

Scenes/prototype.tscn

@@ -1,19 +1,122 @@
-[gd_scene load_steps=4 format=3 uid="uid://b1lmku8qo5ln5"]
+[gd_scene load_steps=7 format=3 uid="uid://b1lmku8qo5ln5"]
 
 [ext_resource type="PackedScene" uid="uid://bge7npb7b1y6x" path="res://Scenes/revolver.tscn" id="1_4ousu"]
 [ext_resource type="PackedScene" uid="uid://j06vthscroca" path="res://Scenes/bullet.tscn" id="2_6koui"]
+[ext_resource type="PackedScene" uid="uid://c7t8himcaqljg" path="res://Blends/Person/person2.gltf" id="3_6koui"]
+
+[sub_resource type="Animation" id="Animation_3mrnv"]
+resource_name = "new_animation"
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("person2/Cylinder_001:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.3, 0.6, 0.8),
+"transitions": PackedFloat32Array(1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(0, 0.349901, -0.530438), Vector3(-0.0617815, 0.349901, -0.536435), Vector3(0.136233, 0.349901, -0.56728), Vector3(0.101021, 0.349901, -0.490088)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("person2/Cylinder_001:rotation")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.3, 0.6, 0.8),
+"transitions": PackedFloat32Array(1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(1.5708, 0, 0), Vector3(1.5708, -0.193505, 0), Vector3(1.5708, -0.483596, 0), Vector3(1.5708, -0.876435, 0)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("person2/Cylinder_002:position")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0, 0.3, 0.6, 0.8, 1),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(0, 0.349901, -1.17486), Vector3(0.0617815, 0.349901, -1.167), Vector3(0.435, 0.349901, -1.13615), Vector3(0.594801, 0.349901, -0.901257), Vector3(0.594801, 0.349901, -0.850009)]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("person2/Cylinder_002:rotation")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0, 0.3, 0.6, 0.8, 1),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(1.5708, 0, 0), Vector3(1.5708, -0.193505, 0), Vector3(1.5708, -0.483596, 0), Vector3(1.5708, -0.876435, 0), Vector3(1.5708, -1.71175, 0)]
+}
+
+[sub_resource type="Animation" id="Animation_uurmw"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("person2/Cylinder_001:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(0, 0.349901, -0.530438)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("person2/Cylinder_001:rotation")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(1.5708, 0, 0)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("person2/Cylinder_002:position")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(0, 0.349901, -1.17486)]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("person2/Cylinder_002:rotation")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(1.5708, 0, 0)]
+}
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_3mrnv"]
+_data = {
+&"RESET": SubResource("Animation_uurmw"),
+&"new_animation": SubResource("Animation_3mrnv")
+}
 
 [node name="Prototype" type="Node3D"]
 
 [node name="Camera3D" type="Camera3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.448508, 1.2315)
 
-[node name="revolver" parent="." instance=ExtResource("1_4ousu")]
-transform = Transform3D(-0.1, -8.74228e-09, 0, 8.74228e-09, -0.1, 0, 0, 0, 0.1, 0.376162, 0, -1.28934)
-is_player_revolver = true
-
 [node name="bullet" parent="." instance=ExtResource("2_6koui")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.114408, 0, -0.120555)
 
@@ -22,3 +125,18 @@ libraries = {
 &"": SubResource("AnimationLibrary_3mrnv")
 }
 autoplay = "new_animation"
+
+[node name="person2" parent="." instance=ExtResource("3_6koui")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.28447, 0, 0.116344)
+
+[node name="Cylinder_001" parent="person2" index="2"]
+transform = Transform3D(0.0938729, 0, 0, 0, -4.10331e-09, -0.0938729, 0, 0.0938729, -4.10331e-09, 0, 0.349901, -0.530438)
+
+[node name="Cylinder_002" parent="person2" index="3"]
+transform = Transform3D(0.0527661, 0, 0, 0, -2.30648e-09, -0.0527661, 0, 0.0527661, -2.30648e-09, 0, 0.349901, -1.17486)
+
+[node name="revolver" parent="person2/Cylinder_002" index="0" instance=ExtResource("1_4ousu")]
+transform = Transform3D(-0.990786, -0.0843367, 0.105973, 0.104904, 0.017018, 0.994336, -0.0856625, 0.996292, -0.00801402, 0.0800285, -14.663, -2.40374)
+is_player_revolver = true
+
+[editable path="person2"]

Scripts/game_manager.gd

@@ -18,10 +18,13 @@ var is_player2_loaded: bool = false
 var bullet_stack: Node3D
 
 var animPl: AnimationPlayer
+
+var last_turn: int
 func _ready() -> void:
 	bullet_shoot.connect(on_bullet_shoot)
 	bullet_selected.connect(on_bullet_selected)
 	
+
 func _input(event: InputEvent) -> void:
 	if event.is_action_released("load"):
 		set_player_turn()
@@ -66,23 +69,26 @@ func check_loaded_bullets(revolver: Node3D):
 		return false
 	
 func end_player_turn():
-	if !is_player2_loaded:
+
-		set_state(GameState.PLAYER2_GUN_LOAD)
 	animPl.play("player_revolver_down")
-	end_turn()
+	#end_turn()
 	
 func end_enemy_turn():
-	if is_player1_loaded == false:
+	animPl.play("enemey_rev_down")
-		print("Player Turn")
+		#set_player_turn()
-		set_player_turn()
+	#end_turn()
-	end_turn()
 func end_turn():
-	if check_unloaded_bullets():
+	if !player1_revolver.can_be_loaded() and !player2_revolver.can_be_loaded() or !check_unloaded_bullets():
-		if is_player1_loaded and is_player2_loaded:
+		var player = get_phase2_player_start()
-			print("Phase 2")
+		if player == 0:
-			get_phase2_player_start()		
+			set_state(GameState.PLAYER1_UNLOAD)
+		else:
+			set_state(GameState.PLAYER2_UNLOAD)
 	else:
-		set_state(GameState.PLAYER2_UNLOAD)
+		if last_turn == 0:
+			set_enemy_turn()
+		else:
+			set_player_turn()
 func get_enemy_revolver() -> Node3D:
 	return player2_revolver
 	
@@ -90,9 +96,9 @@ func get_enemy_revolver() -> Node3D:
 func get_phase2_player_start():
 	var randNumb = randi_range(0,1)
 	if randNumb == 0:
-		set_state(GameState.PLAYER1_UNLOAD)
+		return 0 
 	else:
-		set_state(GameState.PLAYER2_UNLOAD)
+		return 1
 
 
 func on_bullet_shoot(target):
@@ -101,8 +107,17 @@ func on_bullet_shoot(target):
 
 func set_player_turn():
 	animPl.play("player_revolver_up")
+
+func set_enemy_turn():
+	animPl.play("enemey_rev_up")
 func on_animation_finished(anim_name):
 	if anim_name == "player_revolver_up":
 		set_state(GameState.PLAYER1_GUN_LOAD)	
 	elif anim_name == "player_revolver_down":
+		last_turn = 0
+		end_turn()
+	elif anim_name == "enemey_rev_up":
 		set_state(GameState.PLAYER2_GUN_LOAD)
+	elif  anim_name == "enemey_rev_down":
+		last_turn = 1
+		end_turn()

Scripts/revolver.gd

@@ -4,16 +4,12 @@ enum revolver_state {UP, DOWN, LOADING}
 var state: int = revolver_state.DOWN
 var game_state: int
 var bullet_target_pos = Vector3(1.95,0.03,4.612) #2.231
-@export var up_pos: Vector3 = Vector3(0.354,4.248,0.425)
-@export var down_pos: Vector3
 var loaded_bullets = Array()
 var max_bullets: int = 6
 var current_round: int = 0
 var timer: Timer
 
 var target_angle: Vector3 = Vector3(0,0,90)
-@export var target_angle_up: Vector3 = Vector3(0,0,90)
-@export var target_angle_down: Vector3 = Vector3(0,0,90)
 @export var is_player_revolver: bool = false
 @export var cylinder: Node3D