From 11cb53ab2946f68a1d690caccc08c8f68757cd1e Mon Sep 17 00:00:00 2001
From: root <root@vscode.infinity>
Date: Mon, 27 Apr 2026 02:57:34 +0000
Subject: [PATCH] =?UTF-8?q?feat(engine):=20InfoToastEvent=20=E2=80=94=20sh?=
 =?UTF-8?q?ow=20locked-mode=20messages=20on-screen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replaces silent info!() log calls with on-screen toasts when the player
presses Z/X/T without reaching the required unlock level. Any system
can now fire InfoToastEvent(message) to surface a brief text overlay
without depending on a specific plugin.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 solitaire_engine/src/animation_plugin.rs   | 10 +++++++++-
 solitaire_engine/src/challenge_plugin.rs   | 11 ++++++-----
 solitaire_engine/src/events.rs             |  5 +++++
 solitaire_engine/src/input_plugin.rs       | 13 +++++++------
 solitaire_engine/src/lib.rs                |  6 +++---
 solitaire_engine/src/time_attack_plugin.rs | 11 ++++++-----
 6 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/solitaire_engine/src/animation_plugin.rs b/solitaire_engine/src/animation_plugin.rs
index 348055f..8de9ccc 100644
--- a/solitaire_engine/src/animation_plugin.rs
+++ b/solitaire_engine/src/animation_plugin.rs
@@ -11,7 +11,7 @@ use crate::auto_complete_plugin::AutoCompleteState;
 use crate::card_plugin::CardEntity;
 use crate::challenge_plugin::ChallengeAdvancedEvent;
 use crate::daily_challenge_plugin::{DailyChallengeCompletedEvent, DailyGoalAnnouncementEvent};
-use crate::events::NewGameConfirmEvent;
+use crate::events::{InfoToastEvent, NewGameConfirmEvent};
 use crate::events::{AchievementUnlockedEvent, GameWonEvent};
 use crate::game_plugin::GameMutation;
 use crate::layout::LayoutResource;
@@ -93,6 +93,7 @@ impl Plugin for AnimationPlugin {
             .add_event::<ChallengeAdvancedEvent>()
             .add_event::<SettingsChangedEvent>()
             .add_event::<NewGameConfirmEvent>()
+            .add_event::<InfoToastEvent>()
             .init_resource::<EffectiveSlideDuration>()
             .add_systems(Startup, init_slide_duration)
             .add_systems(
@@ -111,6 +112,7 @@ impl Plugin for AnimationPlugin {
                     handle_settings_toast,
                     handle_auto_complete_toast,
                     handle_new_game_confirm_toast,
+                    handle_info_toast,
                     tick_toasts,
                 )
                     .after(GameMutation),
@@ -322,6 +324,12 @@ fn handle_new_game_confirm_toast(
     }
 }
 
+fn handle_info_toast(mut commands: Commands, mut events: EventReader<InfoToastEvent>) {
+    for ev in events.read() {
+        spawn_toast(&mut commands, ev.0.clone(), 3.0);
+    }
+}
+
 fn tick_toasts(
     mut commands: Commands,
     time: Res<Time>,
diff --git a/solitaire_engine/src/challenge_plugin.rs b/solitaire_engine/src/challenge_plugin.rs
index 97587aa..34dd875 100644
--- a/solitaire_engine/src/challenge_plugin.rs
+++ b/solitaire_engine/src/challenge_plugin.rs
@@ -8,7 +8,7 @@ use bevy::prelude::*;
 use solitaire_core::game_state::GameMode;
 use solitaire_data::{challenge_count, challenge_seed_for, save_progress_to};
 
-use crate::events::{GameWonEvent, NewGameRequestEvent};
+use crate::events::{GameWonEvent, InfoToastEvent, NewGameRequestEvent};
 use crate::game_plugin::GameMutation;
 use crate::progress_plugin::{ProgressResource, ProgressStoragePath, ProgressUpdate};
 use crate::resources::GameStateResource;
@@ -31,6 +31,7 @@ impl Plugin for ChallengePlugin {
         app.add_event::<ChallengeAdvancedEvent>()
             .add_event::<GameWonEvent>()
             .add_event::<NewGameRequestEvent>()
+            .add_event::<InfoToastEvent>()
             // Run after ProgressUpdate so we don't fight ProgressPlugin's add_xp.
             .add_systems(Update, advance_on_challenge_win.after(ProgressUpdate))
             .add_systems(Update, handle_start_challenge_request.before(GameMutation));
@@ -66,15 +67,15 @@ fn handle_start_challenge_request(
     keys: Res<ButtonInput<KeyCode>>,
     progress: Res<ProgressResource>,
     mut new_game: EventWriter<NewGameRequestEvent>,
+    mut info_toast: EventWriter<InfoToastEvent>,
 ) {
     if !keys.just_pressed(KeyCode::KeyX) {
         return;
     }
     if progress.0.level < CHALLENGE_UNLOCK_LEVEL {
-        info!(
-            "Challenge mode locked — reach level {} (currently {}).",
-            CHALLENGE_UNLOCK_LEVEL, progress.0.level
-        );
+        info_toast.send(InfoToastEvent(format!(
+            "Challenge mode unlocks at level {CHALLENGE_UNLOCK_LEVEL}"
+        )));
         return;
     }
     let Some(seed) = challenge_seed_for(progress.0.challenge_index) else {
diff --git a/solitaire_engine/src/events.rs b/solitaire_engine/src/events.rs
index a26a065..d45a338 100644
--- a/solitaire_engine/src/events.rs
+++ b/solitaire_engine/src/events.rs
@@ -75,3 +75,8 @@ pub struct ManualSyncRequestEvent;
 /// confirmation window sends `NewGameRequestEvent`.
 #[derive(Event, Debug, Clone, Copy, Default)]
 pub struct NewGameConfirmEvent;
+
+/// Generic informational toast message. Any system can fire this to display
+/// a short string to the player, e.g. "Locked — reach level 5".
+#[derive(Event, Debug, Clone)]
+pub struct InfoToastEvent(pub String);
diff --git a/solitaire_engine/src/input_plugin.rs b/solitaire_engine/src/input_plugin.rs
index c7a16c9..35ebc2b 100644
--- a/solitaire_engine/src/input_plugin.rs
+++ b/solitaire_engine/src/input_plugin.rs
@@ -25,8 +25,8 @@ use solitaire_core::rules::{can_place_on_foundation, can_place_on_tableau};
 use crate::card_plugin::{CardEntity, TABLEAU_FAN_FRAC};
 use crate::challenge_plugin::CHALLENGE_UNLOCK_LEVEL;
 use crate::events::{
-    DrawRequestEvent, MoveRejectedEvent, MoveRequestEvent, NewGameConfirmEvent, NewGameRequestEvent,
-    StateChangedEvent, UndoRequestEvent,
+    DrawRequestEvent, InfoToastEvent, MoveRejectedEvent, MoveRequestEvent, NewGameConfirmEvent,
+    NewGameRequestEvent, StateChangedEvent, UndoRequestEvent,
 };
 use crate::game_plugin::GameMutation;
 use crate::progress_plugin::ProgressResource;
@@ -48,6 +48,7 @@ pub struct InputPlugin;
 impl Plugin for InputPlugin {
     fn build(&self, app: &mut App) {
         app.add_event::<NewGameConfirmEvent>()
+            .add_event::<InfoToastEvent>()
             .add_systems(
                 Update,
                 (
@@ -75,6 +76,7 @@ fn handle_keyboard(
     mut undo: EventWriter<UndoRequestEvent>,
     mut new_game: EventWriter<NewGameRequestEvent>,
     mut confirm_event: EventWriter<NewGameConfirmEvent>,
+    mut info_toast: EventWriter<InfoToastEvent>,
     mut draw: EventWriter<DrawRequestEvent>,
 ) {
     // Tick down any active confirmation window.
@@ -114,10 +116,9 @@ fn handle_keyboard(
                 mode: Some(solitaire_core::game_state::GameMode::Zen),
             });
         } else {
-            info!(
-                "Zen mode locked — reach level {} (currently {}).",
-                CHALLENGE_UNLOCK_LEVEL, level
-            );
+            info_toast.send(InfoToastEvent(format!(
+                "Zen mode unlocks at level {CHALLENGE_UNLOCK_LEVEL}"
+            )));
         }
     }
     if keys.just_pressed(KeyCode::KeyD) {
diff --git a/solitaire_engine/src/lib.rs b/solitaire_engine/src/lib.rs
index b762b7f..5322755 100644
--- a/solitaire_engine/src/lib.rs
+++ b/solitaire_engine/src/lib.rs
@@ -39,9 +39,9 @@ pub use auto_complete_plugin::AutoCompletePlugin;
 pub use audio_plugin::{AudioPlugin, AudioState, SoundLibrary};
 pub use card_plugin::{CardEntity, CardLabel, CardPlugin};
 pub use events::{
-    AchievementUnlockedEvent, CardFlippedEvent, DrawRequestEvent, GameWonEvent, ManualSyncRequestEvent,
-    MoveRejectedEvent, MoveRequestEvent, NewGameConfirmEvent, NewGameRequestEvent, StateChangedEvent,
-    UndoRequestEvent,
+    AchievementUnlockedEvent, CardFlippedEvent, DrawRequestEvent, GameWonEvent, InfoToastEvent,
+    ManualSyncRequestEvent, MoveRejectedEvent, MoveRequestEvent, NewGameConfirmEvent,
+    NewGameRequestEvent, StateChangedEvent, UndoRequestEvent,
 };
 pub use game_plugin::{GameMutation, GamePlugin, GameStatePath};
 pub use help_plugin::{HelpPlugin, HelpScreen};
diff --git a/solitaire_engine/src/time_attack_plugin.rs b/solitaire_engine/src/time_attack_plugin.rs
index 44dd148..333c34d 100644
--- a/solitaire_engine/src/time_attack_plugin.rs
+++ b/solitaire_engine/src/time_attack_plugin.rs
@@ -8,7 +8,7 @@ use bevy::prelude::*;
 use solitaire_core::game_state::GameMode;
 
 use crate::challenge_plugin::CHALLENGE_UNLOCK_LEVEL;
-use crate::events::{GameWonEvent, NewGameRequestEvent};
+use crate::events::{GameWonEvent, InfoToastEvent, NewGameRequestEvent};
 use crate::game_plugin::GameMutation;
 use crate::progress_plugin::ProgressResource;
 use crate::resources::GameStateResource;
@@ -39,6 +39,7 @@ impl Plugin for TimeAttackPlugin {
             .add_event::<TimeAttackEndedEvent>()
             .add_event::<GameWonEvent>()
             .add_event::<NewGameRequestEvent>()
+            .add_event::<InfoToastEvent>()
             .add_systems(
                 Update,
                 handle_start_time_attack_request.before(GameMutation),
@@ -53,15 +54,15 @@ fn handle_start_time_attack_request(
     progress: Res<ProgressResource>,
     mut session: ResMut<TimeAttackResource>,
     mut new_game: EventWriter<NewGameRequestEvent>,
+    mut info_toast: EventWriter<InfoToastEvent>,
 ) {
     if !keys.just_pressed(KeyCode::KeyT) {
         return;
     }
     if progress.0.level < CHALLENGE_UNLOCK_LEVEL {
-        info!(
-            "Time Attack locked — reach level {} (currently {}).",
-            CHALLENGE_UNLOCK_LEVEL, progress.0.level
-        );
+        info_toast.send(InfoToastEvent(format!(
+            "Time Attack unlocks at level {CHALLENGE_UNLOCK_LEVEL}"
+        )));
         return;
     }
     *session = TimeAttackResource {