diff --git a/emergence_lib/src/items/inventory.rs b/emergence_lib/src/items/inventory.rs index 0a7df4a08..18859723a 100644 --- a/emergence_lib/src/items/inventory.rs +++ b/emergence_lib/src/items/inventory.rs @@ -1,5 +1,6 @@ //! Storage of multiple items with a capacity. +use bevy::log::warn; use itertools::rev; use serde::{Deserialize, Serialize}; diff --git a/emergence_lib/src/water/mod.rs b/emergence_lib/src/water/mod.rs index 3fd3a5e88..284f1d6d8 100644 --- a/emergence_lib/src/water/mod.rs +++ b/emergence_lib/src/water/mod.rs @@ -147,7 +147,7 @@ impl Plugin for WaterPlugin { app.insert_resource(WaterConfig::IN_GAME) .init_resource::(); - app.configure_setss( + app.configure_sets( FixedUpdate, ( WaterSet::VerticalWaterMovement, diff --git a/emergence_lib/src/water/ocean.rs b/emergence_lib/src/water/ocean.rs index c8c467436..8b7437cd9 100644 --- a/emergence_lib/src/water/ocean.rs +++ b/emergence_lib/src/water/ocean.rs @@ -42,7 +42,7 @@ pub(super) fn tides( let settings = water_config.tide_settings; // The factor of TAU compensates for the natural period of the sine function. - let scaled_time = time * std::f32::consts::TAU / settings.delta().0; + let scaled_time = time * std::f32::consts::TAU / settings.period.0; // The sine function can have a range of [-1, 1], // so at its lowest point we are subtracting the amplitude. diff --git a/emergence_lib/src/water/water_dynamics.rs b/emergence_lib/src/water/water_dynamics.rs index d644d5cb3..1f7ed2fd6 100644 --- a/emergence_lib/src/water/water_dynamics.rs +++ b/emergence_lib/src/water/water_dynamics.rs @@ -498,7 +498,7 @@ mod tests { // Our key systems are run in the fixed update schedule. // In order to ensure that the water table is updated in our tests, we must advance the fixed time. let mut fixed_time = app.world.resource_mut::>(); - fixed_time.tick(scenario.simulated_duration); + fixed_time.advance_by(scenario.simulated_duration); app }