diff options
Diffstat (limited to 'godot/scenes')
| -rw-r--r-- | godot/scenes/characters/PlayerRigid.tscn | 2 | ||||
| -rw-r--r-- | godot/scenes/vehicles/Gunbrig.tscn | 1 | ||||
| -rw-r--r-- | godot/scenes/weapons/hands.gd | 2 | ||||
| -rw-r--r-- | godot/scenes/weapons/pistol.gd | 2 | ||||
| -rw-r--r-- | godot/scenes/weapons/rockets.gd | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/godot/scenes/characters/PlayerRigid.tscn b/godot/scenes/characters/PlayerRigid.tscn index d66655a..9822c20 100644 --- a/godot/scenes/characters/PlayerRigid.tscn +++ b/godot/scenes/characters/PlayerRigid.tscn @@ -43,7 +43,7 @@ physics_material_override = SubResource( 8 ) continuous_cd = true contacts_reported = 3 contact_monitor = true -can_sleep = false +sleeping = true axis_lock_angular_x = true axis_lock_angular_y = true axis_lock_angular_z = true diff --git a/godot/scenes/vehicles/Gunbrig.tscn b/godot/scenes/vehicles/Gunbrig.tscn index 250eb69..205b03c 100644 --- a/godot/scenes/vehicles/Gunbrig.tscn +++ b/godot/scenes/vehicles/Gunbrig.tscn @@ -333,6 +333,7 @@ shape = SubResource( 35 ) [node name="NavigationMeshInstance" type="NavigationMeshInstance" parent="."] navmesh = SubResource( 26 ) +enabled = false [node name="Hull" type="MeshInstance" parent="NavigationMeshInstance"] visible = false diff --git a/godot/scenes/weapons/hands.gd b/godot/scenes/weapons/hands.gd index 567ff85..aac1d5f 100644 --- a/godot/scenes/weapons/hands.gd +++ b/godot/scenes/weapons/hands.gd @@ -28,7 +28,7 @@ func attack1(): var hit = player_owner.melee_ray.get_collider() player_owner.rpc("play_weapon_sound", "res://sounds/punch_generic.wav") if hit.has_method("damage"): - hit.rpc("damage", fist_damage, "BLUNT", [player_owner.get_network_master(), player_owner.name], "using fists") + hit.rpc("damage", fist_damage, {"type" : "BLUNT", "attacker_net_id" : player_owner.get_network_master(), "attacker_name" : player_owner.name, "weapon_name": "fists"}) if hit.has_method("net_apply_impulse"): hit.rpc("net_apply_impulse", -100*player_owner.melee_ray.global_transform.basis.z) yield(player_owner.get_tree().create_timer(0.55), "timeout") diff --git a/godot/scenes/weapons/pistol.gd b/godot/scenes/weapons/pistol.gd index 219696b..10130a7 100644 --- a/godot/scenes/weapons/pistol.gd +++ b/godot/scenes/weapons/pistol.gd @@ -51,7 +51,7 @@ func attack1(): if player_owner.gun_ray.is_colliding(): var hit = player_owner.gun_ray.get_collider() if hit.has_method("damage"): - hit.rpc("damage", bullet_damage, "PIERCE", [player_owner.get_network_master(), player_owner.name], "using a pistol") + hit.rpc("damage", bullet_damage, {"type":"PIERCE", "attacker_net_id" : player_owner.get_network_master(), "attacker_name": player_owner.name, "weapon_name" : " pistol"}) else: var puff = preload("res://particles/DirtPuff.tscn").instance() player_owner.world.add_child(puff) diff --git a/godot/scenes/weapons/rockets.gd b/godot/scenes/weapons/rockets.gd index 5270186..fddeded 100644 --- a/godot/scenes/weapons/rockets.gd +++ b/godot/scenes/weapons/rockets.gd @@ -8,7 +8,7 @@ var rockets_left: int = 5 const name: String = "HANDS" -var trfrm = Transform ( Vector3(1.501,-0.142,-2.418), Vector3(-2.367,-0.693,-1.429),Vector3(-0.516,2.761,-0.483),Vector3(-0.206,0.639,-0.045)) +var trfrm := Transform ( Vector3(1.501,-0.142,-2.418), Vector3(-2.367,-0.693,-1.429),Vector3(-0.516,2.761,-0.483),Vector3(-0.206,0.639,-0.045)) func _init(): rockets_scene = preload("res://scenes/weapons/rockets.tscn").instance() |