From afe3b978942df782f1d4dc3588a142a2506bb7c6 Mon Sep 17 00:00:00 2001
From: demenik <dominik.bernroider@icloud.com>
Date: Thu, 27 Nov 2025 17:47:10 +0100
Subject: [PATCH 1/3] feat: Add inventory and item components (#48)

---
 src/features/inventory/components.rs |  9 +++++++++
 src/features/inventory/mod.rs        | 11 +++++++++++
 src/features/mod.rs                  |  2 ++
 src/main.rs                          |  1 +
 src/prelude.rs                       |  1 +
 5 files changed, 24 insertions(+)
 create mode 100644 src/features/inventory/components.rs
 create mode 100644 src/features/inventory/mod.rs

diff --git a/src/features/inventory/components.rs b/src/features/inventory/components.rs
new file mode 100644
index 0000000..009269f
--- /dev/null
+++ b/src/features/inventory/components.rs
@@ -0,0 +1,9 @@
+use crate::prelude::*;
+
+#[derive(Component)]
+pub struct Item;
+
+#[derive(Resource, Default)]
+pub struct Inventory {
+    pub items: Vec<Entity>,
+}
diff --git a/src/features/inventory/mod.rs b/src/features/inventory/mod.rs
new file mode 100644
index 0000000..128d7c5
--- /dev/null
+++ b/src/features/inventory/mod.rs
@@ -0,0 +1,11 @@
+use crate::prelude::*;
+
+pub mod components;
+
+pub struct InventoryPlugin;
+
+impl Plugin for InventoryPlugin {
+    fn build(&self, app: &mut App) {
+        app.init_resource::<Inventory>();
+    }
+}
diff --git a/src/features/mod.rs b/src/features/mod.rs
index 3cd19db..d426610 100644
--- a/src/features/mod.rs
+++ b/src/features/mod.rs
@@ -3,6 +3,7 @@ pub mod core;
 pub mod game_screen;
 pub mod grid;
 pub mod input;
+pub mod inventory;
 pub mod phase;
 pub mod pom;
 pub mod savegame;
@@ -14,6 +15,7 @@ pub use core::CorePlugin;
 pub use game_screen::GameScreenPlugin;
 pub use grid::GridPlugin;
 pub use input::InputPlugin;
+pub use inventory::InventoryPlugin;
 pub use phase::PhasePlugin;
 pub use pom::PomPlugin;
 pub use savegame::SavegamePlugin;
diff --git a/src/main.rs b/src/main.rs
index 8b26ce0..5c07bfc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -32,6 +32,7 @@ fn main() {
             features::StatusPlugin,
             features::SavegamePlugin,
             features::UiPlugin,
+            features::InventoryPlugin,
         ))
         .insert_resource(config)
         .run();
diff --git a/src/prelude.rs b/src/prelude.rs
index 15a1fc2..5bfe8e3 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -7,6 +7,7 @@ pub use crate::features::{
         consts::TILE_SIZE,
         utils::{grid_to_world_coords, world_to_grid_coords},
     },
+    inventory::components::{Inventory, Item},
     phase::components::{CurrentPhase, Phase},
     pom::{
         components::{GridPosition, MovingState, Pom},

From 78997acf3175449f1e42bd06fdbee109d0d16b02 Mon Sep 17 00:00:00 2001
From: demenik <dominik.bernroider@icloud.com>
Date: Thu, 27 Nov 2025 18:08:35 +0100
Subject: [PATCH 2/3] feat: Add inventory savegame loading (#48)

---
 src/features/inventory/components.rs | 13 ++++++++++++-
 src/features/savegame/mod.rs         | 20 ++++++++++++++++++++
 src/prelude.rs                       |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/features/inventory/components.rs b/src/features/inventory/components.rs
index 009269f..bbb5ff5 100644
--- a/src/features/inventory/components.rs
+++ b/src/features/inventory/components.rs
@@ -3,7 +3,18 @@ use crate::prelude::*;
 #[derive(Component)]
 pub struct Item;
 
-#[derive(Resource, Default)]
+#[derive(Serialize, Deserialize, Clone)]
+pub enum ItemType {
+    Berry,
+}
+
+#[derive(Component, Serialize, Deserialize, Clone)]
+pub struct ItemStack {
+    pub item_type: ItemType,
+    pub amount: u32,
+}
+
+#[derive(Resource, Default, Serialize, Deserialize)]
 pub struct Inventory {
     pub items: Vec<Entity>,
 }
diff --git a/src/features/savegame/mod.rs b/src/features/savegame/mod.rs
index d52d6b6..a492b1c 100644
--- a/src/features/savegame/mod.rs
+++ b/src/features/savegame/mod.rs
@@ -28,6 +28,7 @@ struct SaveData {
     session_tracker: SessionTracker,
     timer_settings: TimerSettings,
     pom_position: GridPosition,
+    inventory: Vec<ItemStack>,
 }
 
 fn dump_savegame(
@@ -39,6 +40,8 @@ fn dump_savegame(
     tracker: Res<SessionTracker>,
     settings: Res<TimerSettings>,
     pom_query: Query<&GridPosition, With<Pom>>,
+    inventory: Res<Inventory>,
+    item_query: Query<&ItemStack>,
 ) {
     for _ in messages.read() {
         let mut tile_states = Vec::new();
@@ -61,6 +64,12 @@ fn dump_savegame(
 
         let pom_pos = pom_query.single().unwrap();
 
+        let item_stacks: Vec<ItemStack> = inventory
+            .items
+            .iter()
+            .filter_map(|entity| item_query.get(*entity).ok().cloned())
+            .collect();
+
         let save_data = SaveData {
             grid_width: grid.width,
             grid_height: grid.height,
@@ -69,6 +78,7 @@ fn dump_savegame(
             session_tracker: tracker.clone(),
             timer_settings: settings.clone(),
             pom_position: *pom_pos,
+            inventory: item_stacks,
         };
 
         match serde_json::to_string_pretty(&save_data) {
@@ -91,6 +101,7 @@ fn dump_savegame(
 }
 
 fn load_savegame(
+    mut commands: Commands,
     mut messages: MessageReader<SavegameLoadMessage>,
     save_path: Res<SavegamePath>,
     grid: Res<Grid>,
@@ -99,6 +110,7 @@ fn load_savegame(
     mut tracker: ResMut<SessionTracker>,
     mut settings: ResMut<TimerSettings>,
     mut pom_query: Query<(&mut GridPosition, &mut Transform), With<Pom>>,
+    mut inventory: ResMut<Inventory>,
 ) {
     for _ in messages.read() {
         if let Ok(mut file) = File::open(&save_path.0) {
@@ -136,6 +148,14 @@ fn load_savegame(
                             }
                         }
                     }
+
+                    let stack_entities: Vec<Entity> = save_data
+                        .inventory
+                        .iter()
+                        .map(|stack| commands.spawn(stack.clone()).id())
+                        .collect();
+                    inventory.items = stack_entities;
+
                     println!("Game loaded from {}", save_path.0.display());
                 }
                 Err(e) => {
diff --git a/src/prelude.rs b/src/prelude.rs
index 5bfe8e3..51be80d 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -7,7 +7,7 @@ pub use crate::features::{
         consts::TILE_SIZE,
         utils::{grid_to_world_coords, world_to_grid_coords},
     },
-    inventory::components::{Inventory, Item},
+    inventory::components::{Inventory, Item, ItemStack, ItemType},
     phase::components::{CurrentPhase, Phase},
     pom::{
         components::{GridPosition, MovingState, Pom},

From 8be97265eed846afadece0898683b713b7bc24d7 Mon Sep 17 00:00:00 2001
From: demenik <dominik.bernroider@icloud.com>
Date: Thu, 27 Nov 2025 23:12:07 +0100
Subject: [PATCH 3/3] feat: Add inventory display popup (#48)

---
 src/features/hud/components.rs         |  1 -
 src/features/hud/mod.rs                | 16 ++++-
 src/features/inventory/components.rs   | 37 +++++++++++-
 src/features/inventory/mod.rs          | 31 +++++++++-
 src/features/inventory/ui/inventory.rs | 83 ++++++++++++++++++++++++++
 src/features/inventory/ui/item.rs      | 53 ++++++++++++++++
 src/features/inventory/ui/mod.rs       |  5 ++
 src/prelude.rs                         |  2 +-
 8 files changed, 219 insertions(+), 9 deletions(-)
 create mode 100644 src/features/inventory/ui/inventory.rs
 create mode 100644 src/features/inventory/ui/item.rs
 create mode 100644 src/features/inventory/ui/mod.rs

diff --git a/src/features/hud/components.rs b/src/features/hud/components.rs
index 547dfae..6d93783 100644
--- a/src/features/hud/components.rs
+++ b/src/features/hud/components.rs
@@ -14,7 +14,6 @@ pub enum TextType {
 
 #[derive(Component)]
 pub enum ButtonType {
-    SavegameDump,
     SettingsOpen,
     SettingsClose,
     SettingsExit,
diff --git a/src/features/hud/mod.rs b/src/features/hud/mod.rs
index a248c1e..92f5bbe 100644
--- a/src/features/hud/mod.rs
+++ b/src/features/hud/mod.rs
@@ -1,3 +1,4 @@
+use crate::features::inventory;
 use crate::features::phase::components::TimerSettings;
 use crate::features::savegame::messages::SavegameDumpMessage;
 use crate::prelude::*;
@@ -50,15 +51,25 @@ fn setup(mut commands: Commands) {
                 TextFont::from_font_size(16.0),
                 TextColor(Color::WHITE)
             ),
+            (
+                Button,
+                inventory::components::ButtonType::InventoryOpen,
+                Node::default(),
+                children![(
+                    Text::new("Inventar"),
+                    TextFont::from_font_size(16.0),
+                    TextColor(Color::WHITE)
+                )]
+            ),
             (
                 Button,
                 ButtonType::SettingsOpen,
                 Node::default(),
-                children![
+                children![(
                     Text::new("Einstellungen"),
                     TextFont::from_font_size(16.0),
                     TextColor(Color::WHITE)
-                ]
+                )]
             )
         ],
     ));
@@ -115,7 +126,6 @@ fn buttons(
                         timer_settings.change(timer_type, *amount)
                     }
                 },
-                _ => {}
             },
             _ => {}
         }
diff --git a/src/features/inventory/components.rs b/src/features/inventory/components.rs
index bbb5ff5..bf2e418 100644
--- a/src/features/inventory/components.rs
+++ b/src/features/inventory/components.rs
@@ -1,13 +1,33 @@
 use crate::prelude::*;
 
-#[derive(Component)]
-pub struct Item;
-
 #[derive(Serialize, Deserialize, Clone)]
 pub enum ItemType {
     Berry,
 }
 
+impl ItemType {
+    pub fn singular(&self) -> String {
+        match self {
+            ItemType::Berry => "Beere",
+        }
+        .into()
+    }
+
+    pub fn plural(&self) -> String {
+        match self {
+            ItemType::Berry => "Beeren",
+        }
+        .into()
+    }
+
+    pub fn description(&self) -> String {
+        match self {
+            ItemType::Berry => "Von Pflanzen erntbar. Kann im Shop zum Einkaufen benutzt werden.",
+        }
+        .into()
+    }
+}
+
 #[derive(Component, Serialize, Deserialize, Clone)]
 pub struct ItemStack {
     pub item_type: ItemType,
@@ -18,3 +38,14 @@ pub struct ItemStack {
 pub struct Inventory {
     pub items: Vec<Entity>,
 }
+
+#[derive(Component)]
+pub enum RootMarker {
+    Inventory,
+}
+
+#[derive(Component)]
+pub enum ButtonType {
+    InventoryOpen,
+    InventoryClose,
+}
diff --git a/src/features/inventory/mod.rs b/src/features/inventory/mod.rs
index 128d7c5..1b60ee8 100644
--- a/src/features/inventory/mod.rs
+++ b/src/features/inventory/mod.rs
@@ -1,11 +1,40 @@
-use crate::prelude::*;
+use crate::{features::inventory::ui::open_inventory, prelude::*};
+use components::*;
 
 pub mod components;
+pub mod ui;
 
 pub struct InventoryPlugin;
 
 impl Plugin for InventoryPlugin {
     fn build(&self, app: &mut App) {
         app.init_resource::<Inventory>();
+
+        app.add_systems(Update, buttons.run_if(in_state(AppState::GameScreen)));
+    }
+}
+
+fn buttons(
+    mut commands: Commands,
+    mut interaction_query: Query<(&Interaction, &ButtonType), (Changed<Interaction>, With<Button>)>,
+    itemstack_query: Query<&ItemStack>,
+    root_query: Query<(Entity, &RootMarker)>,
+) {
+    for (interaction, button_type) in &mut interaction_query {
+        match *interaction {
+            Interaction::Pressed => match button_type {
+                ButtonType::InventoryOpen => {
+                    open_inventory(&mut commands, itemstack_query);
+                }
+                ButtonType::InventoryClose => {
+                    for (entity, root) in root_query.iter() {
+                        match *root {
+                            RootMarker::Inventory => commands.entity(entity).despawn(),
+                        }
+                    }
+                }
+            },
+            _ => {}
+        }
     }
 }
diff --git a/src/features/inventory/ui/inventory.rs b/src/features/inventory/ui/inventory.rs
new file mode 100644
index 0000000..7c981d9
--- /dev/null
+++ b/src/features/inventory/ui/inventory.rs
@@ -0,0 +1,83 @@
+use super::super::components::{ButtonType, RootMarker};
+use crate::{features::inventory::ui::list_itemstack, prelude::*};
+
+pub fn open_inventory(commands: &mut Commands, items: Query<&ItemStack>) {
+    commands
+        .spawn((
+            RootMarker::Inventory,
+            Node {
+                position_type: PositionType::Absolute,
+                width: percent(100),
+                height: percent(100),
+                justify_content: JustifyContent::Center,
+                align_items: AlignItems::Center,
+                ..default()
+            },
+            ZIndex(1),
+            BackgroundColor(Color::srgba(0.0, 0.0, 0.0, 0.8)),
+        ))
+        .with_children(|parent| {
+            parent
+                .spawn((
+                    Node {
+                        flex_direction: FlexDirection::Column,
+                        align_items: AlignItems::Center,
+                        padding: UiRect::all(px(20.0)),
+                        ..default()
+                    },
+                    BackgroundColor(Color::srgb(0.2, 0.2, 0.2)),
+                    BorderRadius::all(px(10.0)),
+                ))
+                .with_children(|parent| {
+                    parent.spawn((
+                        Node {
+                            width: percent(100.0),
+                            justify_content: JustifyContent::SpaceBetween,
+                            align_items: AlignItems::Center,
+                            margin: UiRect::bottom(px(20.0)),
+                            column_gap: px(20.0),
+                            ..default()
+                        },
+                        children![
+                            (
+                                Text::new("Inventar"),
+                                TextFont::from_font_size(40.0),
+                                TextColor(Color::WHITE),
+                            ),
+                            (
+                                Button,
+                                ButtonType::InventoryClose,
+                                Node {
+                                    width: px(40.0),
+                                    height: px(40.0),
+                                    justify_content: JustifyContent::Center,
+                                    align_items: AlignItems::Center,
+                                    ..default()
+                                },
+                                BackgroundColor(Color::srgb(0.8, 0.2, 0.2)),
+                                BorderRadius::MAX,
+                                children![(
+                                    Text::new("X"),
+                                    TextFont::from_font_size(24.0),
+                                    TextColor(Color::WHITE),
+                                )]
+                            )
+                        ],
+                    ));
+
+                    parent
+                        .spawn(Node {
+                            width: percent(100),
+                            flex_direction: FlexDirection::Column,
+                            margin: UiRect::top(px(10.0)),
+                            row_gap: px(10.0),
+                            ..default()
+                        })
+                        .with_children(|parent| {
+                            for itemstack in items.iter() {
+                                parent.spawn(list_itemstack(itemstack));
+                            }
+                        });
+                });
+        });
+}
diff --git a/src/features/inventory/ui/item.rs b/src/features/inventory/ui/item.rs
new file mode 100644
index 0000000..d674bc6
--- /dev/null
+++ b/src/features/inventory/ui/item.rs
@@ -0,0 +1,53 @@
+use crate::prelude::*;
+
+pub fn list_itemstack(itemstack: &ItemStack) -> impl Bundle {
+    let name = match itemstack.amount {
+        1 => itemstack.item_type.singular(),
+        _ => itemstack.item_type.plural(),
+    };
+
+    (
+        Node {
+            flex_direction: FlexDirection::Row,
+            column_gap: px(8),
+            align_items: AlignItems::Center,
+            padding: UiRect::all(px(4)),
+            ..default()
+        },
+        BackgroundColor(NORMAL_BUTTON),
+        BorderRadius::all(px(10)),
+        children![
+            (
+                // Placeholder for icon
+                Node {
+                    height: percent(100),
+                    aspect_ratio: Some(1.0),
+                    ..default()
+                },
+                BackgroundColor(HOVERED_BUTTON),
+                BorderRadius::all(px(10))
+            ),
+            (
+                Node {
+                    flex_direction: FlexDirection::Column,
+                    justify_content: JustifyContent::Center,
+                    row_gap: px(4),
+                    padding: UiRect::vertical(px(4)),
+                    ..default()
+                },
+                children![
+                    (
+                        Text::new(format!("{} ({})", name, itemstack.amount)),
+                        TextFont::from_font_size(14.0),
+                        TextColor(Color::WHITE)
+                    ),
+                    (
+                        Text::new(itemstack.item_type.description()),
+                        TextFont::from_font_size(10.0),
+                        TextColor(Color::WHITE)
+                    )
+                ]
+            )
+        ],
+    )
+}
diff --git a/src/features/inventory/ui/mod.rs b/src/features/inventory/ui/mod.rs
new file mode 100644
index 0000000..0af7a88
--- /dev/null
+++ b/src/features/inventory/ui/mod.rs
@@ -0,0 +1,5 @@
+pub mod inventory;
+pub mod item;
+
+pub use inventory::*;
+pub use item::*;
diff --git a/src/prelude.rs b/src/prelude.rs
index f3adadd..972c6fd 100644
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -7,7 +7,7 @@ pub use crate::features::{
         consts::TILE_SIZE,
         utils::{grid_to_world_coords, world_to_grid_coords},
     },
-    inventory::components::{Inventory, Item, ItemStack, ItemType},
+    inventory::components::{Inventory, ItemStack, ItemType},
     phase::components::{CurrentPhase, Phase},
     pom::{
         components::{GridPosition, MovingState, Pom},