From f99108c4f0c4ac1abfbcf6b62120bebb50b3bc7b Mon Sep 17 00:00:00 2001 From: Rendo Date: Wed, 10 Dec 2025 00:08:57 +0500 Subject: [PATCH] alleged fixes --- multiplayer/team_spawner.gd | 2 +- systems/weapon_system/weapon_system.gd | 4 ++-- weapons/molikman/molik/molik.gd | 5 +++-- weapons/molikman/molik/throw.gd | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/multiplayer/team_spawner.gd b/multiplayer/team_spawner.gd index 56fa840..bba5b25 100644 --- a/multiplayer/team_spawner.gd +++ b/multiplayer/team_spawner.gd @@ -50,7 +50,7 @@ func spawn_player(id: int) -> void: inst.global_position = new_position func spawn_spectator(id: int) -> void: - var spectator: PackedScene = load("res://scenes/spectator.tscn") + var spectator: PackedScene = load("res://players/spectator.tscn") var inst = spectator.instantiate() inst.name = str(id) diff --git a/systems/weapon_system/weapon_system.gd b/systems/weapon_system/weapon_system.gd index b73be85..80e2603 100644 --- a/systems/weapon_system/weapon_system.gd +++ b/systems/weapon_system/weapon_system.gd @@ -86,13 +86,13 @@ func switch(to: StringName, exit: bool = true): if slots.has(to) == false or slots[to] == null or slots[to] == current_state or (multiplayer.get_remote_sender_id() != 1 and is_multiplayer_authority() == false): return if current_state != null and exit: - current_state.exit() + current_state._exit() if current_state.can_be_previous: last_slot = slots.find_key(current_state) else: last_slot = "" current_state = slots[to] - current_state.enter() + current_state._enter() ammo_updated.emit(current_state.ammo,current_state.remaining_ammo) switched_to.emit(current_state) diff --git a/weapons/molikman/molik/molik.gd b/weapons/molikman/molik/molik.gd index 8143c75..614cd37 100644 --- a/weapons/molikman/molik/molik.gd +++ b/weapons/molikman/molik/molik.gd @@ -1,8 +1,9 @@ extends CharacterBody3D func _physics_process(delta: float) -> void: - - velocity += get_gravity() * delta + if is_multiplayer_authority() == false: + return + velocity += get_gravity() * delta / 4 if is_on_floor(): var fire: Node3D = preload("res://weapons/molikman/molik/molikman_molotov_fire.tscn").instantiate() diff --git a/weapons/molikman/molik/throw.gd b/weapons/molikman/molik/throw.gd index f6a9e91..60748e5 100644 --- a/weapons/molikman/molik/throw.gd +++ b/weapons/molikman/molik/throw.gd @@ -25,4 +25,4 @@ func fire() -> void: var molotov: CharacterBody3D = molik.instantiate() Session.dynamic_objects_parent.add_child(molotov,true) molotov.global_transform = machine.player_camera.global_transform - molotov.velocity = -molotov.global_basis.z * 100 + molotov.velocity = -molotov.global_basis.z * 25