add how to play

closes #64

Author: it-me-joda

art/fonts.aseprite

@@ -175,7 +175,6 @@ fn fade_out(
         audio.set_volume(
             current_volume.fade_towards(Volume::Linear(0.0), time.delta_secs() / fade_out.duration),
         );
-        println!("fading out: {:?}", audio.volume().to_linear());
         if audio.volume().to_linear() <= 0.15 {
             commands.entity(entity).despawn();
         }

assets/font.ttf

@@ -126,7 +126,7 @@ fn spawn_player(mut commands: Commands, asset_server: Res<AssetServer>) {
             timer: Timer::from_seconds(0.15, TimerMode::Once),
             shield: 2,
             shield_regen: Timer::from_seconds(5.0, TimerMode::Once),
-            shield_hit_cooldown: Timer::from_seconds(1.0, TimerMode::Once),
+            shield_hit_cooldown: Timer::from_seconds(0.5, TimerMode::Once),
         },
         Sprite {
             image: asset_server.load("sprites/ships/ship3.png"),
@@ -236,7 +236,6 @@ fn stopwatch(
     mut game_stats: ResMut<GameStats>,
     mut end_game: ResMut<EndGame>,
 ) {
-    println!("time played: {:?}", game_stats.time_played);
     if game_stats.time_played > 300.0 {
         game_stats.time_played = 300.0;
         end_game.0 = true;
@@ -635,7 +634,7 @@ fn restart_game(
     mut pause_state: ResMut<NextState<PauseState>>,
     mut game_state: ResMut<NextState<GameState>>,
     mut has_entered: ResMut<HasEntered>,
-    mut player: Query<&mut Transform, With<Player>>,
+    mut player: Query<(&mut Transform, &mut Player)>,
     asteroids: Query<Entity, With<Asteroid>>,
     projectiles: Query<Entity, With<Projectile>>,
     mut end_game: ResMut<EndGame>,
@@ -651,8 +650,11 @@ fn restart_game(
 
     end_game.0 = false;
     pause_state.set(PauseState::NotPaused);
-    let mut player_transform = player.single_mut().unwrap();
+    let (mut player_transform, mut player) = player.single_mut().unwrap();
     player_transform.translation = Vec3::new(0.0, -280.0, 0.0);
+    player.shield = 2;
+    player.shield_hit_cooldown.reset();
+    player.shield_regen.reset();
 
     let mut planet_transform = planet.single_mut().unwrap();
     planet_transform.translation = Vec3::new(0.0, 400.0, -11.0);

src/audio/mod.rs

@@ -0,0 +1,153 @@
+use bevy::{prelude::*, text::FontSmoothing};
+use leafwing_input_manager::prelude::ActionState;
+
+use crate::{PIXEL_PERFECT_LAYERS, ScaleFactor, input::Action, screens::Screen};
+
+pub(super) fn plugin(app: &mut App) {
+    app.add_systems(OnEnter(Screen::HowToPlay), spawn_howtoplay);
+    app.add_systems(
+        Update,
+        (howtoplay_input, howtoplay_button).run_if(in_state(Screen::HowToPlay)),
+    );
+}
+
+fn spawn_howtoplay(
+    mut commands: Commands,
+    scale_factor: Res<ScaleFactor>,
+    asset_server: Res<AssetServer>,
+) {
+    let scale = scale_factor.0;
+    let font_handle = asset_server.load("font.ttf");
+    commands.spawn((
+        Name::new("HowToPlay container"),
+        Node {
+            width: Val::Percent(80.0),
+            height: Val::Percent(80.0),
+            margin: UiRect::all(Val::Auto),
+            padding: UiRect::all(Val::Px(8.0 * scale)),
+            justify_content: JustifyContent::Center,
+            align_items: AlignItems::Center,
+            flex_direction: FlexDirection::Column,
+            ..default()
+        },
+        DespawnOnExit(Screen::HowToPlay),
+        PIXEL_PERFECT_LAYERS,
+        children![
+            (
+                Name::new("HowToPlay"),
+                Text::new("HOW TO PLAY"),
+                TextFont {
+                    font_size: 16.0 * scale,
+                    font: font_handle.clone(),
+                    font_smoothing: FontSmoothing::None,
+                    ..default()
+                },
+                Node {
+                    position_type: PositionType::Absolute,
+                    top: Val::Px(0.0),
+                    margin: UiRect {
+                        left: Val::Auto,
+                        right: Val::Auto,
+                        ..default()
+                    },
+                    ..default()
+                }
+            ),
+            (
+                Text::new("MOVE WITH WASD / ARROWS / ANALOG STICK / D PAD"),
+                TextFont {
+                    font_size: 12.0 * scale,
+                    font: font_handle.clone(),
+                    font_smoothing: FontSmoothing::None,
+                    ..default()
+                },
+                Node {
+                    padding: UiRect {
+                        top: Val::Px(8.0 * scale),
+                        bottom: Val::Px(8.0 * scale),
+                        ..default()
+                    },
+                    ..default()
+                },
+            ),
+            (
+                Text::new("SHOOT WITH SPACE / BOTTOM BUTTON ON GAMEPAD CLUSTER"),
+                TextFont {
+                    font_size: 12.0 * scale,
+                    font: font_handle.clone(),
+                    font_smoothing: FontSmoothing::None,
+                    ..default()
+                },
+                Node {
+                    padding: UiRect {
+                        top: Val::Px(8.0 * scale),
+                        bottom: Val::Px(8.0 * scale),
+                        ..default()
+                    },
+                    ..default()
+                },
+            ),
+            (
+                Text::new("PAUSE WITH ESCAPE / GAMEPAD START / GAMEPAD SELECT"),
+                TextFont {
+                    font_size: 12.0 * scale,
+                    font: font_handle.clone(),
+                    font_smoothing: FontSmoothing::None,
+                    ..default()
+                },
+                Node {
+                    padding: UiRect {
+                        top: Val::Px(8.0 * scale),
+                        bottom: Val::Px(8.0 * scale),
+                        ..default()
+                    },
+                    ..default()
+                },
+            ),
+            (
+                Name::new("Back to menu button"),
+                Button,
+                Node {
+                    position_type: PositionType::Absolute,
+                    bottom: Val::Px(0.0),
+                    margin: UiRect {
+                        left: Val::Auto,
+                        right: Val::Auto,
+                        ..default()
+                    },
+                    ..default()
+                },
+                children![(
+                    Name::new("Back to menu text"),
+                    Text::new("BACK TO MENU"),
+                    TextFont {
+                        font_size: 16.0 * scale,
+                        font: font_handle.clone(),
+                        font_smoothing: FontSmoothing::None,
+                        ..default()
+                    }
+                )]
+            ),
+        ],
+    ));
+}
+
+fn howtoplay_button(
+    interaction_query: Query<&Interaction, Changed<Interaction>>,
+    mut screen: ResMut<NextState<Screen>>,
+) {
+    for interaction in interaction_query.iter() {
+        if *interaction == Interaction::Pressed {
+            screen.set(Screen::Title)
+        }
+    }
+}
+
+fn howtoplay_input(
+    action_state: Single<&ActionState<Action>>,
+    mut screen: ResMut<NextState<Screen>>,
+) {
+    if action_state.just_pressed(&Action::Select) {
+        screen.set(Screen::Title);
+    }
+}

src/screens/game.rs

@@ -4,6 +4,7 @@ mod credits;
 mod endgame;
 mod game;
 mod gameover;
+mod howtoplay;
 mod pause;
 mod splash;
 mod title;
@@ -19,13 +20,15 @@ pub(super) fn plugin(app: &mut App) {
         pause::plugin,
         gameover::plugin,
         endgame::plugin,
+        howtoplay::plugin,
     ));
 }
 
 #[derive(States, Copy, Clone, Eq, PartialEq, Hash, Debug, Default)]
 pub enum Screen {
     #[default]
     Splash,
+    HowToPlay,
     Title,
     Game,
     Credits,

src/screens/howtoplay.rs

@@ -20,6 +20,7 @@ pub(super) fn plugin(app: &mut App) {
 
 #[derive(Component)]
 enum MenuButton {
+    HowToPlay,
     NewGame,
     // Settings,
     Credits,
@@ -68,9 +69,16 @@ fn spawn_title_screen(
     }
     let font_handle: Handle<Font> = asset_server.load("font.ttf");
 
+    let how_to_play = title_menu_button(
+        "HOW TO PLAY",
+        0,
+        MenuButton::HowToPlay,
+        font_handle.clone(),
+        scale,
+    );
     let new_game = title_menu_button(
         "NEW GAME",
-        0,
+        1,
         MenuButton::NewGame,
         font_handle.clone(),
         scale,
@@ -84,18 +92,18 @@ fn spawn_title_screen(
     // );
     let credits = title_menu_button(
         "CREDITS",
-        1,
+        2,
         MenuButton::Credits,
         font_handle.clone(),
         scale,
     );
 
     #[cfg(target_arch = "wasm32")]
-    let menu_buttons = children![new_game, credits];
+    let menu_buttons = children![how_to_play, new_game, credits];
     #[cfg(not(target_arch = "wasm32"))]
-    let quit = title_menu_button("QUIT", 2, MenuButton::Quit, font_handle.clone(), scale);
+    let quit = title_menu_button("QUIT", 3, MenuButton::Quit, font_handle.clone(), scale);
     #[cfg(not(target_arch = "wasm32"))]
-    let menu_buttons = children![new_game, credits, quit];
+    let menu_buttons = children![how_to_play, new_game, credits, quit];
 
     commands.spawn((
         Node {
@@ -134,9 +142,9 @@ fn input_system(
     let action_state = input_query.single().unwrap();
 
     #[cfg(not(target_arch = "wasm32"))]
-    let max_index = 2;
+    let max_index = 3;
     #[cfg(target_arch = "wasm32")]
-    let max_index = 1;
+    let max_index = 2;
 
     if action_state.just_pressed(&Action::Up) {
         if active_index.0 == 0 {
@@ -165,13 +173,16 @@ fn input_system(
     if action_state.just_pressed(&Action::Select) {
         match active_index.0 {
             0 => {
+                screen_state.set(Screen::HowToPlay);
+            }
+            1 => {
                 screen_state.set(Screen::Game);
                 commands.trigger(RestartGame);
             }
-            1 => {
+            2 => {
                 screen_state.set(Screen::Credits);
             }
-            2 => {
+            3 => {
                 message_writer.write(AppExit::Success);
             }
             _ => {}
@@ -189,6 +200,9 @@ fn button_system(
     for (interaction, menu_button, children) in interaction_query {
         match *interaction {
             Interaction::Pressed => match menu_button {
+                MenuButton::HowToPlay => {
+                    screen_state.set(Screen::HowToPlay);
+                }
                 MenuButton::NewGame => {
                     screen_state.set(Screen::Game);
                     commands.trigger(RestartGame);
@@ -207,13 +221,14 @@ fn button_system(
                     .entity(*children.first().unwrap())
                     .insert(TextColor(WHITE));
                 match menu_button {
-                    MenuButton::NewGame => active_index.0 = 0,
-                    MenuButton::Credits => active_index.0 = 1,
+                    MenuButton::HowToPlay => active_index.0 = 0,
+                    MenuButton::NewGame => active_index.0 = 1,
+                    MenuButton::Credits => active_index.0 = 2,
                     // MenuButton::Settings => {
                     //     active_index.0 = 1;
                     // }
                     #[cfg(not(target_arch = "wasm32"))]
-                    MenuButton::Quit => active_index.0 = 2,
+                    MenuButton::Quit => active_index.0 = 3,
                 }
             }
             Interaction::None => {