From 4d51178d32e07c070c61aa7567856bec7eda3639 Mon Sep 17 00:00:00 2001 From: Anson Bridges Date: Fri, 2 Sep 2022 23:12:33 -0700 Subject: hit/killsounds, swimming, main menu, fixed explosion physics --- scenes/weapons/rockets.gd | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'scenes/weapons') diff --git a/scenes/weapons/rockets.gd b/scenes/weapons/rockets.gd index e765a93..fedeebd 100644 --- a/scenes/weapons/rockets.gd +++ b/scenes/weapons/rockets.gd @@ -4,7 +4,7 @@ var weapon_name = "ROCKETS" var player onready var world = get_tree().get_root().get_node("GAMEWORLD") -var ammo_full : int = 5 +var ammo_full : int = 50 var ammo : int var reload_time :float= 1.0 @@ -22,19 +22,16 @@ func attack1(): if cooldown_time <= 0.0 and ammo >= 1: ammo -= 1 cooldown_time = reload_time - rpc("add_rocket_to_scene", -1*player.cam.global_transform.basis.z) + rpc("add_rocket_to_scene", -1*player.cam.global_transform.basis.z, get_tree().get_network_unique_id()) -remotesync func add_rocket_to_scene(dir): - print(dir) +remotesync func add_rocket_to_scene(dir, id): var rocket = preload("res://scenes/ballistics/Rocket.tscn").instance() world.get_node("BALLISTICS").add_child(rocket, true) rocket.shooter = player.name + " (" + world.players_info[player.get_network_master()][0] + ")" - #rocket.set_network_master(player.get_network_master()) - #if get_tree().get_network_unique_id() == player.get_network_master(): + rocket.shooter_id = id rocket.global_transform.origin = player.cam.global_transform.origin rocket.global_transform.basis.x = dir rocket.add_collision_exception_with(player) - func attack2(): pass -- cgit v1.2.3