From 1ea451993d8a77814ba2478b0507ed388a42f4b9 Mon Sep 17 00:00:00 2001
From: Rendo <geometicalplayer@gmail.com>
Date: Sat, 15 Nov 2025 20:29:43 +0500
Subject: [PATCH] Projectile spawn

---
 src/projectile.rs   | 17 +++++++++++----
 src/ships/mod.rs    | 10 ++++++---
 src/ships/player.rs | 52 ++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/src/projectile.rs b/src/projectile.rs
index c2c4290..8cb6b4b 100644
--- a/src/projectile.rs
+++ b/src/projectile.rs
@@ -14,6 +14,9 @@ pub struct Projectile {
     despawn_countdown: Timer,
 }
 
+#[derive(Resource)]
+pub struct ProjectileSprite(Handle<Image>);
+
 pub struct ProjectilePlugin;
 
 impl Projectile {
@@ -28,10 +31,15 @@ impl Projectile {
 
 impl Plugin for ProjectilePlugin {
     fn build(&self, app: &mut App) {
-        app.add_systems(FixedPreUpdate, projectile_despawn_countdown);
+        app.add_systems(Startup, projectile_startup)
+            .add_systems(FixedPreUpdate, projectile_despawn_countdown);
     }
 }
 
+pub fn projectile_startup(mut commands: Commands, asset_server: Res<AssetServer>) {
+    commands.insert_resource(ProjectileSprite(asset_server.load("projectile.png")));
+}
+
 pub fn projectile_despawn_countdown(
     mut commands: Commands,
     time: Res<Time>,
@@ -47,16 +55,17 @@ pub fn projectile_despawn_countdown(
 
 pub fn spawn_projectile(
     commands: &mut Commands,
-    sprite: Handle<Image>,
+    sprite: Res<ProjectileSprite>,
+    transform: Transform,
     damage: u32,
     faction: Factions,
 ) {
     commands
         .spawn((
             Projectile::new(damage, faction),
-            Sprite::from(sprite),
+            Sprite::from(sprite.0.clone()),
             Collider::new(8.),
-            Transform::from_xyz(0., 0., 0.),
+            transform,
             Velocity::moving(128.0, 0.0),
         ))
         .observe(observe_collision);
diff --git a/src/ships/mod.rs b/src/ships/mod.rs
index d57737b..40ffbf4 100644
--- a/src/ships/mod.rs
+++ b/src/ships/mod.rs
@@ -40,18 +40,22 @@ impl Plugin for ShipsPlugin {
     fn build(&self, app: &mut bevy::app::App) {
         app.insert_resource(Time::<Fixed>::from_hz(60.))
             .add_systems(Startup, startup)
-            .add_systems(FixedUpdate, player::player_movement_system);
+            .add_systems(
+                FixedUpdate,
+                (
+                    player::player_movement_system,
+                    player::player_shooting_system,
+                ),
+            );
     }
 }
 
 fn startup(mut commands: Commands, asset_server: Res<AssetServer>) {
     let player_sprite: Handle<Image> = asset_server.load("player.png");
     let enemy_sprite: Handle<Image> = asset_server.load("enemy.png");
-    let projectile: Handle<Image> = asset_server.load("projectile.png");
 
     commands.spawn(Camera2d);
 
     player::spawn_player(&mut commands, player_sprite, Vec2::new(0., 0.));
     enemy::spawn_enemy(&mut commands, enemy_sprite.clone(), Vec2::new(100., 100.));
-    spawn_projectile(&mut commands, projectile, 1, Factions::PlayerFaction);
 }
diff --git a/src/ships/player.rs b/src/ships/player.rs
index 2f39199..2adfcaf 100644
--- a/src/ships/player.rs
+++ b/src/ships/player.rs
@@ -1,26 +1,43 @@
-use crate::{collision::Collider, damagable::Damagable, ships::Factions, velocity::Velocity};
+use crate::{
+    collision::Collider,
+    damagable::Damagable,
+    projectile::{ProjectileSprite, spawn_projectile},
+    ships::Factions,
+    velocity::Velocity,
+};
 use bevy::prelude::*;
 
 #[derive(Component)]
-#[require(Velocity, Damagable)]
-pub struct Player {
+#[require(Velocity)]
+pub struct PlayerMovement {
     pub(super) acceleration: f32,
 }
 
+#[derive(Component)]
+pub struct PlayerGun {
+    shoot_timer: Timer,
+    damage: u32,
+}
+
 pub fn spawn_player(commands: &mut Commands, sprite: Handle<Image>, at: Vec2) {
     commands.spawn((
-        Player { acceleration: 100. },
+        PlayerMovement { acceleration: 100. },
+        PlayerGun {
+            shoot_timer: Timer::from_seconds(0.2, TimerMode::Once),
+            damage: 1,
+        },
         Collider::new(8.),
         Sprite::from(sprite),
         Transform::from_xyz(at.x, at.y, 0.),
         Factions::PlayerFaction,
+        Damagable::new(15),
     ));
 }
 
 pub(super) fn player_movement_system(
     time: Res<Time>,
     keyboard_input: Res<ButtonInput<KeyCode>>,
-    query: Single<(&mut Velocity, &Player)>,
+    query: Single<(&mut Velocity, &PlayerMovement)>,
 ) {
     let (mut movable, player) = query.into_inner();
     let mut movement_factor = 0.0;
@@ -45,3 +62,28 @@ pub(super) fn player_movement_system(
         .clamp(-movable.max_linear_speed, movable.max_linear_speed);
     movable.rotation_speed = rotation_factor * movable.max_rotation_speed;
 }
+
+pub fn player_shooting_system(
+    mut commands: Commands,
+    time: Res<Time>,
+    keyboard_input: Res<ButtonInput<KeyCode>>,
+    projectile_sprite: Res<ProjectileSprite>,
+    query: Single<(&mut PlayerGun, &Transform)>,
+) {
+    let (mut gun, transform) = query.into_inner();
+    gun.shoot_timer.tick(time.delta());
+
+    if gun.shoot_timer.is_finished() == false || keyboard_input.pressed(KeyCode::Space) == false {
+        return;
+    }
+
+    spawn_projectile(
+        &mut commands,
+        projectile_sprite,
+        transform.clone(),
+        gun.damage,
+        Factions::PlayerFaction,
+    );
+
+    gun.shoot_timer.reset();
+}