demenik/pomomon-garden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: track total berries earned in session and savegames (#61)

Browse Source
This commit is contained in:
demenik
2025-12-09 19:29:14 +01:00
parent 28550c1955
commit a7aa54c570
10 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/common/mod.rs
View File

@@ -2,6 +2,7 @@ use bevy::prelude::*;
use pomomon_garden::features::config::components::{BerrySeedConfig, GameConfig};
use pomomon_garden::features::grid::components::{Grid, Tile, TileState};
use pomomon_garden::features::inventory::components::{Inventory, ItemStack, ItemType};
use pomomon_garden::features::phase::components::SessionTracker;
pub fn setup_app(
grid_width: u32,
@@ -64,6 +65,8 @@ pub fn setup_app(
berry_seeds: seeds,
..Default::default()
});
app.init_resource::<SessionTracker>();
app
}

17
tests/harvest.rs
View File

@@ -2,6 +2,7 @@ use bevy::ecs::system::RunSystemOnce;
use pomomon_garden::features::config::components::{BerrySeedConfig, GameConfig};
use pomomon_garden::features::grid::components::{Grid, TileState};
use pomomon_garden::features::inventory::components::{Inventory, ItemStack, ItemType};
use pomomon_garden::features::phase::components::SessionTracker;
use pomomon_garden::features::pom::actions::InteractionAction;
use pomomon_garden::prelude::*;
@@ -41,7 +42,8 @@ fn test_harvest_fully_grown() {
mut tile_query: Query<&mut TileState>,
mut inventory: ResMut<Inventory>,
mut item_stack_query: Query<&mut ItemStack>,
config: Res<GameConfig>| {
config: Res<GameConfig>,
mut session_tracker: ResMut<SessionTracker>| {
InteractionAction::Harvest.execute(
(0, 0),
&grid,
@@ -50,6 +52,7 @@ fn test_harvest_fully_grown() {
&mut item_stack_query,
&mut commands,
&config,
&mut session_tracker,
);
},
);
@@ -70,6 +73,10 @@ fn test_harvest_fully_grown() {
let stack = app.world().entity(stack_entity).get::<ItemStack>().unwrap();
assert_eq!(stack.item_type, ItemType::Berry);
assert_eq!(stack.amount, 5);
// Check Session Tracker
let tracker = app.world().resource::<SessionTracker>();
assert_eq!(tracker.total_berries_earned, 5);
}
#[test]
@@ -105,7 +112,8 @@ fn test_harvest_withered() {
mut tile_query: Query<&mut TileState>,
mut inventory: ResMut<Inventory>,
mut item_stack_query: Query<&mut ItemStack>,
config: Res<GameConfig>| {
config: Res<GameConfig>,
mut session_tracker: ResMut<SessionTracker>| {
InteractionAction::Harvest.execute(
(0, 0),
&grid,
@@ -114,6 +122,7 @@ fn test_harvest_withered() {
&mut item_stack_query,
&mut commands,
&config,
&mut session_tracker,
);
},
);
@@ -164,7 +173,8 @@ fn test_cannot_harvest_growing() {
mut tile_query: Query<&mut TileState>,
mut inventory: ResMut<Inventory>,
mut item_stack_query: Query<&mut ItemStack>,
config: Res<GameConfig>| {
config: Res<GameConfig>,
mut session_tracker: ResMut<SessionTracker>| {
InteractionAction::Harvest.execute(
(0, 0),
&grid,
@@ -173,6 +183,7 @@ fn test_cannot_harvest_growing() {
&mut item_stack_query,
&mut commands,
&config,
&mut session_tracker,
);
},
);

9
tests/planting.rs
View File

@@ -2,6 +2,7 @@ use bevy::ecs::system::RunSystemOnce;
use pomomon_garden::features::config::components::GameConfig;
use pomomon_garden::features::grid::components::{Grid, TileState};
use pomomon_garden::features::inventory::components::{Inventory, ItemStack, ItemType};
use pomomon_garden::features::phase::components::SessionTracker;
use pomomon_garden::features::pom::actions::InteractionAction;
use pomomon_garden::prelude::*;
@@ -27,7 +28,8 @@ fn test_plant_seed_interaction() {
mut inventory: ResMut<Inventory>,
mut item_stack_query: Query<&mut ItemStack>,
mut commands: Commands,
game_config: Res<GameConfig>| {
game_config: Res<GameConfig>,
mut session_tracker: ResMut<SessionTracker>| {
let action = InteractionAction::Plant(seed_type.clone());
action.execute(
(1, 1),
@@ -37,6 +39,7 @@ fn test_plant_seed_interaction() {
&mut item_stack_query,
&mut commands,
&game_config,
&mut session_tracker,
);
},
);
@@ -98,7 +101,8 @@ fn test_plant_seed_no_inventory() {
mut inventory: ResMut<Inventory>,
mut item_stack_query: Query<&mut ItemStack>,
mut commands: Commands,
game_config: Res<GameConfig>| {
game_config: Res<GameConfig>,
mut session_tracker: ResMut<SessionTracker>| {
let action = InteractionAction::Plant(seed_type.clone());
action.execute(
(1, 1),
@@ -108,6 +112,7 @@ fn test_plant_seed_no_inventory() {
&mut item_stack_query,
&mut commands,
&game_config,
&mut session_tracker,
);
},
);

3
tests/session.rs
View File

@@ -39,6 +39,7 @@ fn test_session_tracker_focus_to_long_break() {
let timer_settings = TimerSettings::default();
let mut session_tracker = SessionTracker {
completed_focus_phases: timer_settings.long_break_interval - 1,
total_berries_earned: 0,
}; // To trigger long break on next phase
next_phase(&mut current_phase, &mut session_tracker, &timer_settings);
@@ -66,6 +67,7 @@ fn test_session_tracker_break_to_focus() {
});
let mut session_tracker = SessionTracker {
completed_focus_phases: 1,
total_berries_earned: 0,
}; // Arbitrary value, should not change
let timer_settings = TimerSettings::default();
@@ -91,6 +93,7 @@ fn test_session_tracker_not_finished_phase_no_change() {
let mut current_phase = CurrentPhase(Phase::Focus { duration: 100.0 });
let mut session_tracker = SessionTracker {
completed_focus_phases: 0,
total_berries_earned: 0,
};
let timer_settings = TimerSettings::default();

5
tests/watering.rs
View File

@@ -2,6 +2,7 @@ use bevy::ecs::system::RunSystemOnce;
use pomomon_garden::features::config::components::GameConfig;
use pomomon_garden::features::grid::components::{Grid, TileState};
use pomomon_garden::features::inventory::components::{Inventory, ItemStack, ItemType};
use pomomon_garden::features::phase::components::SessionTracker;
use pomomon_garden::features::pom::actions::InteractionAction;
use pomomon_garden::prelude::*;
@@ -57,7 +58,8 @@ fn test_water_crop() {
mut inventory: ResMut<Inventory>,
mut item_stack_query: Query<&mut ItemStack>,
mut commands: Commands,
game_config: Res<GameConfig>| {
game_config: Res<GameConfig>,
mut session_tracker: ResMut<SessionTracker>| {
let action = InteractionAction::Water;
action.execute(
(1, 1),
@@ -67,6 +69,7 @@ fn test_water_crop() {
&mut item_stack_query,
&mut commands,
&game_config,
&mut session_tracker,
);
},
);