chore: finishing touches before game jam release

ProspectPyxis · Mar 4, 2022 · bee6fc7 · bee6fc7
1 parent 12625b2
commit bee6fc7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/src/common.rs b/src/common.rs
@@ -97,9 +97,6 @@ pub struct MainCamera;
 #[derive(Component)]
 pub struct Player;
 
-#[derive(Component)]
-pub struct BlockableProjectile;
-
 pub enum EnemyAI {
     ChasesPlayer { speed: f32 },
     Archer { target_y: f32 },
@@ -183,7 +180,6 @@ pub struct Animated {
 pub enum MainMenuButton {
     Start,
     Credits,
-    Exit,
 }
 
 #[derive(Component)]

diff --git a/src/menu.rs b/src/menu.rs
@@ -2,7 +2,7 @@ use crate::common::{
     CurrentDay, DayEndReason, EndDayEvent, EnemyMorale, GameAudio, GameFonts, GameOverButton,
     GameSprites, GameState, MainMenuButton, NarrationViewed, OpeningNarration, Ui,
 };
-use bevy::{app::AppExit, prelude::*};
+use bevy::prelude::*;
 use bevy_ecs_tilemap::prelude::*;
 use bevy_kira_audio::Audio;
 
@@ -59,7 +59,6 @@ pub fn button_main_menu(
     mut current_day: ResMut<CurrentDay>,
     audio: Res<GameAudio>,
     audio_player: Res<Audio>,
-    mut app_exit: EventWriter<AppExit>,
     mut narration_viewed: ResMut<NarrationViewed>,
 ) {
     for (interaction, mut color, button_type) in q_interaction.iter_mut() {
@@ -80,9 +79,6 @@ pub fn button_main_menu(
                     MainMenuButton::Credits => {
                         state.set(GameState::Credits).unwrap();
                     }
-                    MainMenuButton::Exit => {
-                        app_exit.send(AppExit);
-                    }
                 }
             }
             Interaction::Hovered => {

diff --git a/src/player.rs b/src/player.rs
@@ -1,9 +1,8 @@
 use crate::common::{
-    get_cursor_position, BlockableProjectile, ChangeSpellEvent, CurrentDay, DamagePlayerEvent,
-    DamagesEnemy, DayEndReason, DespawnTimer, EndDayEvent, EnemyMorale, GameAudio, GameFonts,
-    GamePhysicsLayer, GameSprites, GameState, Health, InGameUI, InvisTimer, LightningStrikeBolt,
-    MainCamera, Player, PlayerSpell, PlayerSpellData, SpellCooldowns, Ui, Vec3Utils, SCREEN_HEIGHT,
-    SCREEN_WIDTH,
+    get_cursor_position, ChangeSpellEvent, CurrentDay, DamagePlayerEvent, DamagesEnemy,
+    DayEndReason, DespawnTimer, EndDayEvent, EnemyMorale, GameAudio, GameFonts, GamePhysicsLayer,
+    GameSprites, GameState, Health, InGameUI, InvisTimer, LightningStrikeBolt, MainCamera, Player,
+    PlayerSpell, PlayerSpellData, SpellCooldowns, Ui, Vec3Utils, SCREEN_HEIGHT, SCREEN_WIDTH,
 };
 use bevy::{input::keyboard::KeyCode, prelude::*};
 use bevy_kira_audio::Audio;
@@ -131,7 +130,6 @@ pub fn player_shoot(
                                         },
                                         ..Default::default()
                                     })
-                                    .insert(BlockableProjectile)
                                     .insert(RigidBody::KinematicVelocityBased)
                                     .insert(Velocity::from_linear(
                                         (cursor_pos - player_t.translation.truncate())