diff options
Diffstat (limited to 'godot/scripts/vehicles/Airplane.gd')
| -rw-r--r-- | godot/scripts/vehicles/Airplane.gd | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/godot/scripts/vehicles/Airplane.gd b/godot/scripts/vehicles/Airplane.gd index aa1f492..9762457 100644 --- a/godot/scripts/vehicles/Airplane.gd +++ b/godot/scripts/vehicles/Airplane.gd @@ -28,7 +28,7 @@ var user = null var world = null func get_init_info(): - return {"." : 0} + return {"linear_velocity" : linear_velocity, "angular_velocity" : angular_velocity, "in_use" : in_use} func mp_init(init_info): pass @@ -61,12 +61,12 @@ func relinquish_control(): #TO BE OVERRIDDEN BY CHILDREN func on_new_control(): - pass#user.add_collision_exception_with(self) - #user.global_transform.origin = $Cockpit.global_transform.origin + user.add_collision_exception_with(self) + user.global_transform.origin = $Cockpit.global_transform.origin func on_no_control(): - pass#user.remove_collision_exception_with(self) - #user.global_transform.origin = $PilotExit.global_transform.origin + user.remove_collision_exception_with(self) + user.global_transform.origin = $PilotExit.global_transform.origin func attack1(): pass @@ -127,6 +127,8 @@ func _physics_process(delta): func _integrate_forces(state): if is_network_master(): + if linear_velocity.angle_to(global_transform.basis.x) < 0.25: + set_linear_velocity(get_linear_velocity().slerp(transform.basis.x*linear_velocity.length(),0.1)) if linear_velocity.length() > 25: #linear_velocity = linear_velocity.normalized()*(linear_velocity.length()-vel_slow) var ang_vel_target = Vector3.ZERO @@ -146,8 +148,7 @@ func _integrate_forces(state): #apply angular velocity angular_velocity = ang_vel_target#lerp(angular_velocity,ang_vel_target,0.1) - if linear_velocity.angle_to(global_transform.basis.x) < 0.25: - set_linear_velocity(get_linear_velocity().slerp(transform.basis.x*linear_velocity.length(),0.1)) + #linear_velocity += parentvel[0]; angular_velocity += parentvel[1] rpc("update_phys_transform", transform, linear_velocity, angular_velocity) |