Elrinth/DungeonsOfKharadum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix so smoke correctly syncs

Browse Source
This commit is contained in:
Elrinth
2025-12-26 08:23:24 +01:00
parent 4915a1d945
commit 93059d12de
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/scripts/entities/world/pot.gd
View File

@@ -260,6 +260,7 @@ func _physics_process(delta: float) -> void:
$SfxDrag2.play() $SfxDrag2.play()
else: else:
is_moving = false is_moving = false
$GPUParticles2D.emitting = false
if $SfxDrag2.playing: if $SfxDrag2.playing:
$SfxDrag2.stop() $SfxDrag2.stop()
previousFrameVel = velocity previousFrameVel = velocity
@@ -440,24 +441,20 @@ func _physics_process(delta: float) -> void:
elif is_being_grabbed and holder_peer_id != 0: elif is_being_grabbed and holder_peer_id != 0:
# Only handle visual/audio effects on client, don't move the pot # Only handle visual/audio effects on client, don't move the pot
# The server handles the actual movement and syncs position via replication # The server handles the actual movement and syncs position via replication
# is_moving is already replicated from server, so use that to control particles
if holder != null and holder.get_multiplayer_authority() == holder_peer_id: if holder != null and holder.get_multiplayer_authority() == holder_peer_id:
# Check if pot appears to be moving (based on position changes from server) # Use replicated is_moving state to control particles (more efficient than syncing emitting)
var pot_movement = global_position - previous_client_position if is_moving:
# Keep particles emitting continuously while moving (don't let timer stop them)
# If pot has moved, it's being pushed/pulled
if pot_movement.length() > 0.5:
is_moving = true
$GPUParticles2D.emitting = true $GPUParticles2D.emitting = true
# Continuously restart timer while moving to keep particles emitting (like server does)
$GPUParticles2D/TimerSmokeParticles.start() $GPUParticles2D/TimerSmokeParticles.start()
if !$SfxDrag2.playing: if !$SfxDrag2.playing:
$SfxDrag2.play() $SfxDrag2.play()
else: else:
is_moving = false $GPUParticles2D.emitting = false
if $SfxDrag2.playing: if $SfxDrag2.playing:
$SfxDrag2.stop() $SfxDrag2.stop()
# Update previous position for next frame
previous_client_position = global_position
else: else:
# No valid holder, clear state # No valid holder, clear state
is_being_grabbed = false is_being_grabbed = false
@@ -947,5 +944,8 @@ func _on_area_2d_pickup_body_exited(_body: Node2D) -> void:
func _on_timer_smoke_particles_timeout() -> void: func _on_timer_smoke_particles_timeout() -> void:
$GPUParticles2D.emitting = false # Only stop particles if pot is not moving (for one-time effects like landing)
# If pot is being pushed/pulled, keep particles emitting
if not is_moving:
$GPUParticles2D.emitting = false
pass # Replace with function body. pass # Replace with function body.