diff options
Diffstat (limited to 'godot/scripts/machines')
| -rw-r--r-- | godot/scripts/machines/Cannon.gd | 6 | ||||
| -rw-r--r-- | godot/scripts/machines/NetworkedMachineGDS.gd | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/godot/scripts/machines/Cannon.gd b/godot/scripts/machines/Cannon.gd index 80c32ef..b8d9f38 100644 --- a/godot/scripts/machines/Cannon.gd +++ b/godot/scripts/machines/Cannon.gd @@ -34,8 +34,8 @@ func mp_init(init_info): # Called when the node enters the scene tree for the first time. func _ready(): if get_parent().name != "MACHINES": #if cannon is aboard ship - add_collision_exception_with(get_parent()) - mode = RigidBody.MODE_STATIC + add_collision_exception_with(get_parent().get_parent()) + mode = RigidBody.MODE_KINEMATIC world_ballistics = world.get_node("BALLISTICS") func on_new_control(): @@ -75,7 +75,7 @@ remotesync func fire(): cball.shooter = user.name + " (" + world.players_info[user.get_network_master()][0] + ")" cball.shooter_id = user.get_network_master() cooldown = fire_rate - if mode == RigidBody.MODE_STATIC: + if mode == RigidBody.MODE_KINEMATIC: get_parent().apply_impulse($YawJoint/PitchJoint.global_transform.origin - get_parent().global_transform.origin, -1*cball.mass*ball_speed*muzzle.global_transform.basis.x) else: if is_network_master(): apply_impulse($YawJoint/PitchJoint.global_transform.origin - global_transform.origin, -1*cball.mass*ball_speed*muzzle.global_transform.basis.x) diff --git a/godot/scripts/machines/NetworkedMachineGDS.gd b/godot/scripts/machines/NetworkedMachineGDS.gd index c1d755d..eb675d0 100644 --- a/godot/scripts/machines/NetworkedMachineGDS.gd +++ b/godot/scripts/machines/NetworkedMachineGDS.gd @@ -5,7 +5,6 @@ var user: RigidBody = null var world: Spatial = null func _ready(): - print("net machine loads world") world = get_tree().get_root().find_node("GAMEWORLD", true, false) remote func update_phys_transform(t: Transform, lv: Vector3, av: Vector3): |