diff options
| author | metamuffin <metamuffin@disroot.org> | 2024-07-26 18:51:21 +0200 |
|---|---|---|
| committer | metamuffin <metamuffin@disroot.org> | 2024-07-26 18:51:21 +0200 |
| commit | 731c55b70f6d4c29a8ddaac229272caa4bd30084 (patch) | |
| tree | f6f3e7894013be126902658ecec893ab155064b7 /client | |
| parent | 9c7673253f7dcc50d761345c3fdcd0d6d3654f3e (diff) | |
| download | hurrycurry-731c55b70f6d4c29a8ddaac229272caa4bd30084.tar hurrycurry-731c55b70f6d4c29a8ddaac229272caa4bd30084.tar.bz2 hurrycurry-731c55b70f6d4c29a8ddaac229272caa4bd30084.tar.zst | |
refactor environment effects
Diffstat (limited to 'client')
| -rw-r--r-- | client/game.gd | 2 | ||||
| -rw-r--r-- | client/map/environment.gd | 17 | ||||
| -rw-r--r-- | client/multiplayer.gd | 6 |
3 files changed, 14 insertions, 11 deletions
diff --git a/client/game.gd b/client/game.gd index b1f209a1..790caf5b 100644 --- a/client/game.gd +++ b/client/game.gd @@ -258,7 +258,7 @@ func _ready(): join() ) - mp.update_environment.connect($Environment.update) + mp.environment.connect($Environment.update) func join(): join_sent = true diff --git a/client/map/environment.gd b/client/map/environment.gd index f36b51b6..abe8ed6c 100644 --- a/client/map/environment.gd +++ b/client/map/environment.gd @@ -1,10 +1,13 @@ extends Node3D -func update(params: Dictionary): - $Wind.emitting = params["wind"] > 0.1 - var a: ParticleProcessMaterial = $Wind.process_material - a.initial_velocity_max = params["wind"] * 15. - a.initial_velocity_min = params["wind"] * 15. +func update(active: Array): - $Rain.emitting = params["rain"] > 0.1 - $Rain.amount = params["rain"] * 500 + $Wind.emitting = active.has("wind") + var a: ParticleProcessMaterial = $Wind.process_material + # TODO ramp + a.initial_velocity_max = 15. if active.has("wind") else 0. + a.initial_velocity_min = 15. if active.has("wind") else 0. + + # TODO ramp + $Rain.emitting = active.has("rain") + $Rain.amount = 500 if active.has("rain") else 0 diff --git a/client/multiplayer.gd b/client/multiplayer.gd index 0e3b450a..6fc5a4c2 100644 --- a/client/multiplayer.gd +++ b/client/multiplayer.gd @@ -50,7 +50,7 @@ signal set_tile_finished(tile: Vector2i, warn: bool) signal set_player_finished(player: int, warn: bool) signal set_ingame(state: bool, lobby: bool) signal score(demands_failed: int, demands_completed: int, points: int, time_remaining: float) -signal update_environment(params: Dictionary) +signal environment(params: Dictionary) signal server_message(text: String) signal replay_start() signal connection_closed(reason: String) @@ -266,8 +266,8 @@ func handle_packet(bytes: PackedByteArray): "server_message": var text = decoded["text"] server_message.emit(text) - "update_environment": - update_environment.emit(decoded) + "environment": + environment.emit(decoded["effects"]) "replay_start": replay_start.emit() _: push_error("Unrecognized packet type: %s" % packet_type) |