vampire-survivor like attack indicator

stillonearth · Jun 13, 2024 · c56e4e9 · c56e4e9
1 parent 4e02029
commit c56e4e9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 100 deletions.
diff --git a/src/entities/player.rs b/src/entities/player.rs
@@ -1,12 +1,12 @@
-use bevy::{ecs::event, prelude::*, time};
+use bevy::{prelude::*};
 use bevy_ecs_ldtk::prelude::*;
 use bevy_kira_audio::prelude::*;
 use bevy_particle_systems::*;
 
 use bevy_rapier2d::prelude::*;
 
 use crate::{
- controls::ControlEvent, gameover::GameOverEvent, loading::load_texture_atlas,
+ gameover::GameOverEvent, loading::load_texture_atlas,
  physics::ColliderBundle, sprites::*, ui::UIPlayerHealth, AudioAssets, GameState,
 };
 

diff --git a/src/entities/weapons/machete.rs b/src/entities/weapons/machete.rs
@@ -2,16 +2,15 @@ use std::time::Duration;
 
 use bevy::{prelude::*, sprite::MaterialMesh2dBundle};
 use bevy_particle_systems::Lerpable;
-use bevy_tweening::{lens::TransformPositionLens, Animator, EaseFunction, Tween};
+
 
 use crate::{
  controls::ControlEvent,
  entities::{
- characters::enemy::{Enemy, EnemyHitEvent},
  player::Player,
  },
 };
-use crate::{loading::StaticSpriteAssets, GameState};
+use crate::{GameState};
 
 // ----------
 // Components
@@ -103,100 +102,6 @@ fn animate_machete_indicator(
  }
 }
 
-// fn animate_arrow(
-// mut commands: Commands,
-// mut queries: ParamSet<(
-// Query<(&Parent, &Transform, &Player)>,
-// Query<(
-// Entity,
-// &mut Transform,
-// &mut Visibility,
-// &WeaponArrow,
-// &mut MacheteIndictorTimer,
-// &mut WeaponArrowHideTimer,
-// )>,
-// )>,
-// mut ev_arrow_attack: EventWriter<WeaponArrowAttackEvent>,
-// time: Res<Time>,
-// ) {
-// if queries.p0().iter().next().is_none() {
-// return;
-// }animate_machete_indicator;
-
-// if timer_activate.0.just_finished() {
-// *visibility = Visibility::Visible;
-
-// timer_hide.0.unpause();
-
-// let end = match arrow {
-// WeaponArrow::Right => Vec3::new(55., 0., 0.),
-// WeaponArrow::Left => Vec3::new(-55., 0., 0.),
-// };
-
-// let tween = Tween::new(
-// EaseFunction::QuadraticInOut,
-// Duration::from_secs_f32(0.15),
-// TransformPositionLens {
-// start: match arrow {
-// WeaponArrow::Right => Vec3::new(20., 0., 0.),
-// WeaponArrow::Left => Vec3::new(-20., 0., 0.),
-// },
-// end,
-// },
-// );
-
-// ev_arrow_attack.send(WeaponArrowAttackEvent {});
-// commands.entity(entity).insert(Animator::new(tween));
-// }
-
-// if timer_hide.0.just_finished() {
-// timer_hide.0.pause();
-// *visibility = Visibility::Hidden;
-
-// transform.translation = match arrow {
-// WeaponArrow::Right => Vec3::new(20., 0., 0.),
-// WeaponArrow::Left => Vec3::new(-20., 0., 0.),
-// };
-// }
-// }
-// }
-
-// fn handle_arrow_attack(
-// mut arrow_attack_events: EventReader<WeaponArrowAttackEvent>,
-// mut ev_enemy_hit: EventWriter<EnemyHitEvent>,
-// mut queries: ParamSet<(
-// Query<(&Transform, &Player)>,
-// Query<(Entity, &Transform, &Enemy)>,
-// )>,
-// ) {
-// for _ in arrow_attack_events.read() {
-// if queries.p0().iter().len() == 0 {
-// return;
-// }
-
-// let player_translation = queries.p0().iter().next().unwrap().0.translation;
-
-// for (e, transfrom, _) in queries.p1().iter() {
-// let translation = transfrom.translation;
-
-// if (translation.z - player_translation.z).abs() > 16.0 {
-// continue;
-// }
-
-// let distance = translation.distance(player_translation).abs();
-
-// if distance > 40.0 {
-// continue;
-// }
-
-// ev_enemy_hit.send(EnemyHitEvent {
-// entity: e,
-// damage: 88,
-// });
-// }
-// }
-// }
-
 // ------
 // Plugin
 // ------

diff --git a/src/gameplay/waves.rs b/src/gameplay/waves.rs
@@ -237,7 +237,7 @@ pub fn ui_wave_info_text(
  }
 }
 
-// Composition of wave events
+#[allow(dead_code)]
 pub fn get_level_1_waves() -> Vec<Wave> {
  vec![
  Wave {