diff options
| -rw-r--r-- | client/game.gd | 2 | ||||
| -rw-r--r-- | client/map/environment.gd | 17 | ||||
| -rw-r--r-- | client/multiplayer.gd | 6 | ||||
| -rw-r--r-- | data/maps/debug.yaml | 3 | ||||
| -rw-r--r-- | server/protocol/src/lib.rs | 11 | ||||
| -rw-r--r-- | server/src/entity/environment_effect.rs | 84 | ||||
| -rw-r--r-- | server/src/entity/mod.rs | 12 | ||||
| -rw-r--r-- | server/src/entity/weather.rs | 51 | ||||
| -rw-r--r-- | server/src/game.rs | 21 | ||||
| -rw-r--r-- | test-client/protocol.ts | 8 |
10 files changed, 119 insertions, 96 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) diff --git a/data/maps/debug.yaml b/data/maps/debug.yaml index d31e2f5b..0ea93d77 100644 --- a/data/maps/debug.yaml +++ b/data/maps/debug.yaml @@ -92,7 +92,8 @@ entities: - !customers - !player_portal { from: [12.5, 8.5], to: [12.5, 2.5] } - !item_portal { from: [14, 4], to: [14, 6] } - - !weather + - !environment_effect { name: rain, on: 90, off: 60, exclusive: true } + - !environment_effect { name: wind, on: 90, off: 60, exclusive: true } tile_entities: "}": !conveyor { dir: [1, 0], filter: dough-foodprocessor } diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs index 2fcc5598..02c6d0b1 100644 --- a/server/protocol/src/lib.rs +++ b/server/protocol/src/lib.rs @@ -203,7 +203,9 @@ pub enum PacketC { }, Menu(Menu), MovementSync, - UpdateEnvironment(Environment), + Environment { + effects: HashSet<String>, + }, /// For use in replay sessions only ReplayStart, @@ -229,13 +231,6 @@ pub struct Score { pub instant_recipes: usize, } -#[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode, Default)] -pub struct Environment { - pub rain: f32, // 0-1; clear..raining - pub wind: f32, // 0-1; still..stormy - pub time: f32, // 0-1; night..morning..noon..evening -} - #[derive(Debug, Clone, Serialize, Deserialize, Encode, Decode, Copy, PartialEq, Eq, Hash)] #[serde(rename_all = "snake_case")] pub enum ItemLocation { diff --git a/server/src/entity/environment_effect.rs b/server/src/entity/environment_effect.rs new file mode 100644 index 00000000..dcfc08c1 --- /dev/null +++ b/server/src/entity/environment_effect.rs @@ -0,0 +1,84 @@ +/* + Hurry Curry! - a game about cooking + Copyright 2024 metamuffin + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, version 3 of the License only. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +*/ +use super::EntityT; +use crate::game::Game; +use hurrycurry_protocol::PacketC; +use rand::random; +use serde::{Deserialize, Serialize}; +use std::{ + collections::VecDeque, + time::{Duration, Instant}, +}; + +#[derive(Clone, Debug, Deserialize, Serialize, Default)] +pub struct EnvironmentEffect { + name: String, + #[serde(default = "default_onoff")] + on: f32, + #[serde(default = "default_onoff")] + off: f32, + exclusive: bool, +} +fn default_onoff() -> f32 { + 40. +} + +#[derive(Clone, Debug)] +pub struct EnvironmentEffectController { + config: EnvironmentEffect, + next_transition: Instant, + active: bool, +} + +impl EnvironmentEffectController { + pub fn new(config: EnvironmentEffect) -> Self { + Self { + next_transition: Instant::now() + Duration::from_secs_f32(config.on), + active: false, + config, + } + } +} +impl EntityT for EnvironmentEffectController { + fn tick( + &mut self, + game: &mut Game, + packet_out: &mut VecDeque<PacketC>, + _dt: f32, + ) -> anyhow::Result<()> { + if self.next_transition < Instant::now() { + if self.active { + self.next_transition += + Duration::from_secs_f32(self.config.on + (0.5 + random::<f32>())); + self.active = false; + game.environment_effects.remove(&self.config.name); + } else { + self.next_transition += + Duration::from_secs_f32(self.config.off * (0.5 + random::<f32>())); + if game.environment_effects.is_empty() || !self.config.exclusive { + self.active = true; + game.environment_effects.insert(self.config.name.clone()); + } + } + packet_out.push_back(PacketC::Environment { + effects: game.environment_effects.clone(), + }) + } + Ok(()) + } +} diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs index d042d458..747dd6b7 100644 --- a/server/src/entity/mod.rs +++ b/server/src/entity/mod.rs @@ -17,14 +17,15 @@ */ pub mod conveyor; pub mod customers; +pub mod environment_effect; pub mod item_portal; pub mod player_portal; -pub mod weather; use crate::{data::ItemTileRegistry, game::Game, interaction::Recipe}; use anyhow::{anyhow, Result}; use conveyor::Conveyor; use customers::{demands::generate_demands, Customers}; +use environment_effect::{EnvironmentEffect, EnvironmentEffectController}; use hurrycurry_protocol::{ glam::{IVec2, Vec2}, ItemIndex, PacketC, TileIndex, @@ -33,7 +34,6 @@ use item_portal::ItemPortal; use player_portal::PlayerPortal; use serde::{Deserialize, Serialize}; use std::collections::{HashMap, HashSet, VecDeque}; -use weather::WeatherController; pub trait EntityT: Clone { fn tick(&mut self, game: &mut Game, packet_out: &mut VecDeque<PacketC>, dt: f32) -> Result<()>; @@ -56,7 +56,7 @@ entities!( ItemPortal, PlayerPortal, Customers, - WeatherController + EnvironmentEffectController ); #[derive(Debug, Clone, Deserialize, Serialize)] @@ -79,7 +79,7 @@ pub enum EntityDecl { to: Vec2, }, Customers {}, - Weather {}, + EnvironmentEffect(EnvironmentEffect), } pub fn construct_entity( @@ -134,6 +134,8 @@ pub fn construct_entity( .collect(); Entity::Customers(Customers::new(chairs, demands)?) } - EntityDecl::Weather {} => Entity::WeatherController(WeatherController::default()), + EntityDecl::EnvironmentEffect(config) => { + Entity::EnvironmentEffectController(EnvironmentEffectController::new(config)) + } }) } diff --git a/server/src/entity/weather.rs b/server/src/entity/weather.rs deleted file mode 100644 index 79ac364f..00000000 --- a/server/src/entity/weather.rs +++ /dev/null @@ -1,51 +0,0 @@ -use super::EntityT; -use crate::{game::Game, InterpolateExt}; -use hurrycurry_protocol::PacketC; -use rand::{random, seq::IndexedRandom, thread_rng}; -use std::{ - collections::VecDeque, - time::{Duration, Instant}, -}; - -#[derive(Clone, Debug)] -pub struct WeatherController { - next_event: Instant, - event: usize, -} - -impl Default for WeatherController { - fn default() -> Self { - Self { - next_event: Instant::now() + Duration::from_secs(10), - event: Default::default(), - } - } -} -impl EntityT for WeatherController { - fn tick( - &mut self, - game: &mut Game, - _packet_out: &mut VecDeque<PacketC>, - dt: f32, - ) -> anyhow::Result<()> { - if self.next_event < Instant::now() { - self.next_event += Duration::from_secs_f32(30. + random::<f32>() * 40.); - if self.event > 0 { - self.event = 0; - } else { - self.event = *[0, 0, 1, 2].choose(&mut thread_rng()).unwrap(); - } - } - - let (rain, wind) = match self.event { - 0 => (0., 0.), - 1 => (0.7, 0.), - 2 => (0., 0.7), - _ => (1., 1.), - }; - game.environment.wind.exp_to(wind, dt * 0.05); - game.environment.rain.exp_to(rain, dt * 0.15); - eprintln!("{:#?}", game.environment); - Ok(()) - } -} diff --git a/server/src/game.rs b/server/src/game.rs index 69272159..d7e62413 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -25,8 +25,8 @@ use anyhow::{anyhow, bail, Result}; use hurrycurry_protocol::{ glam::{IVec2, Vec2}, movement::MovementBase, - ClientGamedata, Environment, ItemIndex, ItemLocation, Menu, Message, PacketC, PacketS, - PlayerID, RecipeIndex, Score, TileIndex, + ClientGamedata, ItemIndex, ItemLocation, Menu, Message, PacketC, PacketS, PlayerID, + RecipeIndex, Score, TileIndex, }; use log::{info, warn}; use std::{ @@ -76,8 +76,7 @@ pub struct Game { end: Option<Instant>, pub lobby: bool, - pub environment_next_update: Instant, - pub environment: Environment, + pub environment_effects: HashSet<String>, pub score_changed: bool, pub score: Score, } @@ -95,13 +94,12 @@ impl Game { data: Gamedata::default().into(), players: HashMap::new(), tiles: HashMap::new(), - environment_next_update: Instant::now(), walkable: HashSet::new(), end: None, entities: Arc::new(RwLock::new(vec![])), players_spatial_index: SpatialIndex::default(), score: Score::default(), - environment: Environment::default(), + environment_effects: HashSet::default(), score_changed: false, } } @@ -123,7 +121,7 @@ impl Game { } self.score = Score::default(); self.end = None; - self.environment = Environment::default(); + self.environment_effects.clear(); self.walkable.clear(); } pub fn load( @@ -222,7 +220,9 @@ impl Game { .collect(), }, }); - out.push(PacketC::UpdateEnvironment(self.environment.clone())); + out.push(PacketC::Environment { + effects: self.environment_effects.clone(), + }); for (&id, player) in &self.players { out.push(PacketC::AddPlayer { id, @@ -599,11 +599,6 @@ impl Game { let now = Instant::now(); - if self.environment_next_update < now { - packet_out.push_back(PacketC::UpdateEnvironment(self.environment.clone())); - self.environment_next_update += Duration::from_secs(5); - } - if let Some(end) = self.end { self.score.time_remaining = (end - now).as_secs_f64(); if end < now { diff --git a/test-client/protocol.ts b/test-client/protocol.ts index ef216ffd..bd32e497 100644 --- a/test-client/protocol.ts +++ b/test-client/protocol.ts @@ -59,7 +59,7 @@ export type PacketC = | { type: "score" } & Score // Supplies information for score OSD | { type: "menu" } & Menu // Open a menu on the client-side | { type: "movement_sync" } // Your movement is difference on the server, you should update your position from a `position` packet - | { type: "update_environment" } & Environment + | { type: "environment", effects: string[] } | { type: "set_ingame", state: boolean, lobby: boolean } // Set to false when entering the game or switching maps | { type: "error", message: string } // Your client did something wrong. @@ -87,9 +87,3 @@ export type Message = export type ItemLocation = { player: PlayerID } | { tile: Vec2 } - -export interface Environment { - rain: number, // 0-1; clear..raining - wind: number, // 0-1; still..stormy - time: number, // 0-1; night..morning..noon..evening -}
\ No newline at end of file |