diff options
| author | Anson Bridges <bridges.anson@gmail.com> | 2022-09-25 06:39:12 -0400 |
|---|---|---|
| committer | Anson Bridges <bridges.anson@gmail.com> | 2022-09-25 06:39:12 -0400 |
| commit | 7a1d857de96174dfa5a0fa40f8c14acbd2f651c2 (patch) | |
| tree | d52acaa4e89b0f8375326ea1aefd0105bb91cfc7 /godot/scenes/ballistics | |
| parent | 62039380a67b6da396d1c8d745d2e2625ba988fc (diff) | |
weapons, viewmodels, some performance fixes
Diffstat (limited to 'godot/scenes/ballistics')
| -rw-r--r-- | godot/scenes/ballistics/Cannonball.tscn | 13 | ||||
| -rw-r--r-- | godot/scenes/ballistics/Rocket.gd | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/godot/scenes/ballistics/Cannonball.tscn b/godot/scenes/ballistics/Cannonball.tscn index 83c3942..4e5d06a 100644 --- a/godot/scenes/ballistics/Cannonball.tscn +++ b/godot/scenes/ballistics/Cannonball.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://scripts/ballistics/Cannonball.gd" type="Script" id=1] @@ -26,6 +26,9 @@ normal_enabled = true normal_scale = 1.0 normal_texture = SubResource( 5 ) +[sub_resource type="BoxShape" id=6] +extents = Vector3( 0.286994, 0.293614, 0.250986 ) + [node name="Cannonball" type="RigidBody"] mass = 10.0 continuous_cd = true @@ -41,4 +44,12 @@ shape = SubResource( 1 ) mesh = SubResource( 2 ) material/0 = SubResource( 3 ) +[node name="PickupArea" type="Area" parent="."] +collision_layer = 2 +collision_mask = 2 +monitoring = false + +[node name="CollisionShape" type="CollisionShape" parent="PickupArea"] +shape = SubResource( 6 ) + [connection signal="body_entered" from="." to="." method="_on_collision"] diff --git a/godot/scenes/ballistics/Rocket.gd b/godot/scenes/ballistics/Rocket.gd index 329825d..e475f9b 100644 --- a/godot/scenes/ballistics/Rocket.gd +++ b/godot/scenes/ballistics/Rocket.gd @@ -39,8 +39,8 @@ remotesync func explode(): if is_network_master(): for body in $BlastArea.get_overlapping_bodies(): if body.has_method("damage"): - body.rpc("damage", 20, "explosive", [shooter_id, shooter], "using 'rocket'") - body.rpc_id(body.get_network_master(), "net_apply_impulse", (500*(body.global_transform.origin - global_transform.origin).normalized())) + body.rpc("damage", 20, "EXPLOSIVE", [shooter_id, shooter], "using 'rocket'") + body.rpc_id(body.get_network_master(), "net_apply_impulse", (1300*(body.global_transform.origin+Vector3(0,1,0) - global_transform.origin).normalized())) $AnimationPlayer.play("explode") func _on_collision(_body): |