From d34c96aa69d2aee1aaa3bb12366b36ff22d674c0 Mon Sep 17 00:00:00 2001 From: Anson Bridges Date: Thu, 20 Oct 2022 13:54:06 -0400 Subject: network work work work --- godot/scripts/vehicles/Airplane.gd | 2 +- godot/scripts/vehicles/Gunboat.gd | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'godot/scripts/vehicles') diff --git a/godot/scripts/vehicles/Airplane.gd b/godot/scripts/vehicles/Airplane.gd index 2de4792..aa084a8 100644 --- a/godot/scripts/vehicles/Airplane.gd +++ b/godot/scripts/vehicles/Airplane.gd @@ -154,7 +154,7 @@ func _integrate_forces(state): ang_vel_target += roll_constant*(roll_dir*roll_curve.curve.interpolate(roll_angle_max-abs(roll_angle)))*global_transform.basis.x else: roll_dir = 1 if roll_angle > 0 else -1 - 3*roll_constant*(roll_dir*roll_curve.curve.interpolate(roll_angle_max-abs(roll_angle)))*global_transform.basis.x + ang_vel_target += 3*roll_constant*(roll_dir*roll_curve.curve.interpolate(roll_angle_max-abs(roll_angle)))*global_transform.basis.x #turn (based on how much the plane is rolled (need to add ang_vel_target += turn_constant*Vector3.UP*roll_angle diff --git a/godot/scripts/vehicles/Gunboat.gd b/godot/scripts/vehicles/Gunboat.gd index 1defce2..1403a50 100644 --- a/godot/scripts/vehicles/Gunboat.gd +++ b/godot/scripts/vehicles/Gunboat.gd @@ -22,7 +22,7 @@ const damage_threshold = 20 const max_depth = 2 #boat ids -onready var nav_rid = $NavigationMeshInstance.get_region_rid() +onready var nav_rid = 0#$NavigationMeshInstance.get_region_rid() #controls var throttle: float = 0.0 @@ -43,8 +43,15 @@ func _ready(): for sail in $SAILS.get_children(): sail.set_sheet(sail_out) world = get_tree().get_root().find_node("GAMEWORLD", true, false) + var plr = get_tree().get_root().find_node("PLAYERS", true, false) + for player in get_node("CREW").get_children(): + var t: Transform = player.global_transform + get_node("CREW").remove_child(player) + plr.add_child(player, true) + player.global_transform = t + #call_deferred("remove_child", get_node("CREW")) if get_tree().get_network_unique_id() == 1: - print("enabling navigation for server") + pass#print("enabling navigation for server") #$NavigationMeshInstance.set_enabled(true) func on_no_control(): -- cgit v1.2.3