diff --git a/src/asteroid.rs b/src/asteroid.rs index a68c844..cb879ab 100644 --- a/src/asteroid.rs +++ b/src/asteroid.rs @@ -51,7 +51,7 @@ pub fn setup_asteroids(mut commands: Commands, asset_server: Res) { Sprite::from(sprite), Transform::from_translation(position), Collider::new(8.), - Damagable::new(20), + Damagable::new(200), )) .observe(bump); } diff --git a/src/ships/enemy.rs b/src/ships/enemy.rs index 11edd83..c4a5788 100644 --- a/src/ships/enemy.rs +++ b/src/ships/enemy.rs @@ -1,6 +1,11 @@ use bevy::prelude::*; -use crate::{collision::Collider, damagable::Damagable, ships::Factions, velocity::Velocity}; +use crate::{ + collision::Collider, + damagable::Damagable, + ships::{Factions, gun::Gun}, + velocity::Velocity, +}; #[derive(Component)] pub struct Enemy; @@ -8,11 +13,12 @@ pub struct Enemy; pub fn spawn_enemy(commands: &mut Commands, sprite: Handle, at: Vec2) { commands.spawn(( Enemy, + Gun::new(5, f32::to_radians(15.), 0.2), Collider::new(8.), Velocity::stopped(500., f32::to_radians(360.)), Sprite::from(sprite), Transform::from_xyz(at.x, at.y, 0.), - Damagable::new(10), + Damagable::new(100), Factions::EnemyFaction, )); } diff --git a/src/ships/player.rs b/src/ships/player.rs index 3f87d38..c01e9c6 100644 --- a/src/ships/player.rs +++ b/src/ships/player.rs @@ -23,12 +23,12 @@ pub fn spawn_player(commands: &mut Commands, sprite: Handle, at: Vec2) { deceleration: 300., stop_epsilon: 50., }, - Gun::new(1, f32::to_radians(15.), 0.2), + Gun::new(20, f32::to_radians(7.), 0.2), Collider::new(8.), Sprite::from(sprite), Transform::from_xyz(at.x, at.y, 0.), Factions::PlayerFaction, - Damagable::new(15), + Damagable::new(150), )); }