diff --git a/3D Input/Pferd_Bein Unwrapped.blend b/3D Input/Pferd_Bein Unwrapped.blend new file mode 100644 index 0000000..31792b6 Binary files /dev/null and b/3D Input/Pferd_Bein Unwrapped.blend differ diff --git a/3D Input/Pferd_Bein Unwrapped.blend1 b/3D Input/Pferd_Bein Unwrapped.blend1 new file mode 100644 index 0000000..68d0c42 Binary files /dev/null and b/3D Input/Pferd_Bein Unwrapped.blend1 differ diff --git a/BodyConfig/bodyBuilderMenu.tscn b/BodyConfig/bodyBuilderMenu.tscn index 50fc9e6..5fa98cd 100644 --- a/BodyConfig/bodyBuilderMenu.tscn +++ b/BodyConfig/bodyBuilderMenu.tscn @@ -6,7 +6,7 @@ [node name="Body Builder Menu" type="Spatial"] script = ExtResource( 2 ) -torsoPath = NodePath("Torso") +torsoPath = NodePath("Player") cameraPath = NodePath("GUI/HBoxC/ViewportContainer/Viewport/Camera") rayCastPath = NodePath("GUI/HBoxC/ViewportContainer/Viewport/MouseLook") viewPortPath = NodePath("GUI/HBoxC/ViewportContainer/Viewport") @@ -65,10 +65,9 @@ enabled = true collide_with_areas = true collide_with_bodies = false -[node name="Torso" parent="." instance=ExtResource( 1 )] +[node name="Torso" parent="." instance=ExtResource( 1 )] [node name="TorsoCollider" parent="Torso" index="0"] shape = null -[connection signal="pressed" from="GUI/HBoxC/VBoxC/Start" to="." method="_on_Start_pressed"] -[editable path="Torso"] +[connection signal="pressed" from="GUI/HBoxC/VBoxC/Start" to="." method="_on_Start_pressed"] diff --git a/BodyConfig/bodyBuildingScript.gd b/BodyConfig/bodyBuildingScript.gd index f3d70e8..f62638c 100644 --- a/BodyConfig/bodyBuildingScript.gd +++ b/BodyConfig/bodyBuildingScript.gd @@ -124,4 +124,4 @@ func delete_body_part(): func _on_Start_pressed(): PhysicsServer.area_set_param(get_viewport().find_world().get_space(), PhysicsServer.AREA_PARAM_GRAVITY, _default_grav) - emit_signal("start_fight") + emit_signal("start_fight", _torso) diff --git a/Controllers/GameStateController.gd b/Controllers/GameStateController.gd index fe7d042..9878b15 100644 --- a/Controllers/GameStateController.gd +++ b/Controllers/GameStateController.gd @@ -50,8 +50,13 @@ func _switch_to_win(player_id): _win_screen_scene.set_win_message(player_id) -func _switch_to_fighting(): +func _switch_to_fighting(torso): + _body_build_scene.remove_child(torso) + torso.translation += Vector3(0, 3, 0) + torso.rotation = Vector3(0, 0, 0) _switch_scene(_fighting_scene, "fight_scene") + + _fighting_scene.add_child(torso) func _switch_to_body_build(): diff --git a/Ingame/Testing.tscn b/Ingame/Testing.tscn index a234ac6..97d61f7 100644 --- a/Ingame/Testing.tscn +++ b/Ingame/Testing.tscn @@ -16,7 +16,7 @@ script = ExtResource( 4 ) [node name="Arena" parent="." instance=ExtResource( 5 )] [node name="Torso" parent="." instance=ExtResource( 3 )] -transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0 ) +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8512, 2, 0 ) [node name="Torso2" parent="." instance=ExtResource( 3 )] transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2, -10 )