Skip to content
This repository has been archived by the owner on Nov 22, 2023. It is now read-only.

Commit

Permalink
Smol fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
alice-i-cecile committed Nov 21, 2023
1 parent 9ce27ee commit f001373
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions emergence_lib/src/items/inventory.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//! Storage of multiple items with a capacity.

use bevy::log::warn;
use itertools::rev;
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion emergence_lib/src/water/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ impl Plugin for WaterPlugin {
app.insert_resource(WaterConfig::IN_GAME)
.init_resource::<Ocean>();

app.configure_setss(
app.configure_sets(
FixedUpdate,
(
WaterSet::VerticalWaterMovement,
Expand Down
2 changes: 1 addition & 1 deletion emergence_lib/src/water/ocean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion emergence_lib/src/water/water_dynamics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Time<Fixed>>();
fixed_time.tick(scenario.simulated_duration);
fixed_time.advance_by(scenario.simulated_duration);

app
}
Expand Down

0 comments on commit f001373

Please sign in to comment.