summaryrefslogtreecommitdiff
path: root/godot/scripts/ballistics
diff options
context:
space:
mode:
Diffstat (limited to 'godot/scripts/ballistics')
-rw-r--r--godot/scripts/ballistics/Cannonball.gd2
-rw-r--r--godot/scripts/ballistics/NetworkedProjectile.gd6
2 files changed, 7 insertions, 1 deletions
diff --git a/godot/scripts/ballistics/Cannonball.gd b/godot/scripts/ballistics/Cannonball.gd
index 7cf59e5..241fc7d 100644
--- a/godot/scripts/ballistics/Cannonball.gd
+++ b/godot/scripts/ballistics/Cannonball.gd
@@ -16,5 +16,5 @@ func get_init_info():
func _on_collision(body):
if is_network_master() and oldvel.length() > 20 and !damage_exceptions.has(body) and body.has_method("damage"):
- body.rpc("damage", oldvel.length(), "blunt", [shooter_id, shooter], "using 'cannon'")
+ body.rpc("damage", oldvel.length(), "BLUNT", [shooter_id, shooter], "using 'cannon'")
damage_exceptions.append(body)
diff --git a/godot/scripts/ballistics/NetworkedProjectile.gd b/godot/scripts/ballistics/NetworkedProjectile.gd
index 9703fa5..a7de71a 100644
--- a/godot/scripts/ballistics/NetworkedProjectile.gd
+++ b/godot/scripts/ballistics/NetworkedProjectile.gd
@@ -8,6 +8,9 @@ var shooter_id = 1
func _ready():
pass # Replace with function body.
+remotesync func set_nm(id):
+ set_network_master(id)
+
func mp_init(init_info):
for variable in init_info.keys():
set(variable, init_info[variable])
@@ -27,3 +30,6 @@ remotesync func net_remove():
func net_master_remove():
if is_network_master():
rpc("net_remove")
+
+remotesync func net_apply_impulse(impulse_v: Vector3):
+ apply_central_impulse(impulse_v)