From b17d324c0505fced6542f9a6c7bde33f79fd3d8b Mon Sep 17 00:00:00 2001
From: Christian Engen <chris.a.engen@gmail.com>
Date: Sat, 22 Jul 2023 08:21:04 +0200
Subject: [PATCH] add finite ammo

---
 assets/textures/icons.png | Bin 0 -> 96 bytes
 src/game/components.rs    |   2 ++
 src/game/mod.rs           |   3 ++-
 src/game/systems.rs       |  37 +++++++++++++++++++++++++++++++++----
 src/main.rs               |   2 ++
 5 files changed, 39 insertions(+), 5 deletions(-)
 create mode 100644 assets/textures/icons.png

diff --git a/assets/textures/icons.png b/assets/textures/icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e0d10e042f2965827752752873f81709b31f6e2
GIT binary patch
literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|q&!_5LnNjq
qCn&K0X=h>s0<}#gm!l^MFfiOo5r2KQ`Oq$)Dh5wiKbLh*2~7aOr5JJm

literal 0
HcmV?d00001

diff --git a/src/game/components.rs b/src/game/components.rs
index e4cf242..88fcf0b 100644
--- a/src/game/components.rs
+++ b/src/game/components.rs
@@ -188,3 +188,5 @@ pub struct Foreground;
 pub struct TextColor;
 #[derive(Component)]
 pub struct DropBombTimer(pub Timer);
+#[derive(Component)]
+pub struct MissileReserve(pub usize);
diff --git a/src/game/mod.rs b/src/game/mod.rs
index 87a9c7f..db91998 100644
--- a/src/game/mod.rs
+++ b/src/game/mod.rs
@@ -8,7 +8,7 @@ use self::{
     effects::{flick_system, timed_removal_system},
     prelude::stage_colors,
     systems::{
-        animate_sprite_indices, animate_sprite_steps, change_colors, drop_bombs,
+        ammo_ui, animate_sprite_indices, animate_sprite_steps, change_colors, drop_bombs,
         explosion_event_listener_system, explosion_system, flame_engulf_system, game_keys,
         game_over_ui, gizmo_missile_trails, health_ui, missile_arrival_event_listner, move_cursor,
         move_missile, move_ufo, reset_game_listener, rotate_player, score_ui, setup_player,
@@ -39,6 +39,7 @@ impl Plugin for GamePlugin {
                         animate_sprite_steps,
                         animate_sprite_indices,
                         score_ui,
+                        ammo_ui,
                     )
                         .run_if(in_state(GameState::InGame).or_else(in_state(GameState::GameOver))),
                     // run these systems if we are in the InGame state
diff --git a/src/game/systems.rs b/src/game/systems.rs
index 6dfb8ea..44e8034 100644
--- a/src/game/systems.rs
+++ b/src/game/systems.rs
@@ -14,8 +14,8 @@ use super::{
         AnimationIndices, AnimationStep, AnimeRemoveOnFinish, Cannon, CannonBase, ChainedMeta,
         Cursor, DropBombTimer, Enemy, EnemySpawn, Engulfable, Explodable, Explosion,
         ExplosionEvent, ExplosionMode, FlameRadius, Foreground, Health, IdCounter, Missile,
-        MissileArrivalEvent, Player, Score, Scoring, SpawnPoint, SplitTimer, Stepper, TargetLock,
-        Ufo, DROP_BOMB_CHANCE, MAX_SPLIT, PLAYER_MISSILE_SPEED, SPLIT_CHANCE,
+        MissileArrivalEvent, MissileReserve, Player, Score, Scoring, SpawnPoint, SplitTimer,
+        Stepper, TargetLock, Ufo, DROP_BOMB_CHANCE, MAX_SPLIT, PLAYER_MISSILE_SPEED, SPLIT_CHANCE,
     },
     effects::{Flick, TimedRemoval},
     prelude::{color_from_vec, Stage, StageHandle},
@@ -28,7 +28,7 @@ pub fn game_keys(
     mut id_counter: ResMut<IdCounter>,
     mut commands: Commands,
     images: Res<ImageAssets>,
-    player: Query<(Entity, With<Player>)>,
+    mut player: Query<((Entity, &mut MissileReserve), With<Player>)>,
     mut cannon_base: Query<
         (Entity, &mut Transform, Has<AnimationIndices>),
         (With<CannonBase>, Without<Cursor>),
@@ -36,7 +36,7 @@ pub fn game_keys(
     time: Res<Time>,
 ) {
     if buttons.just_pressed(MouseButton::Left) {
-        let player_entity = player.single().0;
+        let (player_entity, mut missile_reserve) = player.single_mut().0;
         commands.entity(player_entity).insert((
             AnimationIndices {
                 first: 0,
@@ -46,6 +46,12 @@ pub fn game_keys(
             AnimeRemoveOnFinish,
         ));
 
+        if missile_reserve.0 == 0 {
+            return;
+        } else {
+            missile_reserve.0 -= 1;
+        }
+
         let target_transform = cursor_pos.single();
         let id = id_counter.next();
         commands.spawn((
@@ -615,6 +621,7 @@ pub fn setup_player(mut commands: Commands, images: Res<ImageAssets>) {
             Player,
             Cannon,
             Health { max: 3, current: 3 },
+            MissileReserve(30),
             Foreground,
         ))
         .id();
@@ -636,6 +643,28 @@ pub fn setup_player(mut commands: Commands, images: Res<ImageAssets>) {
 /* UI
  * Systems that are called every frame to update the egui UI
  */
+pub fn ammo_ui(
+    mut contexts: EguiContexts,
+    images: Res<ImageAssets>,
+    missile_ammo: Query<&MissileReserve, With<Player>>,
+) {
+    let ammo = missile_ammo.single();
+    let ammo_id = contexts.add_image(images.missile.clone_weak());
+
+    egui::Area::new("Ammo")
+        .anchor(Align2::LEFT_TOP, egui::emath::vec2(10., 5.))
+        .show(contexts.ctx_mut(), |ui: &mut egui::Ui| {
+            ui.with_layout(egui::Layout::left_to_right(egui::Align::TOP), |ui| {
+                ui.image(ammo_id, egui::emath::vec2(16., 16.));
+                ui.label(
+                    RichText::new(format!("{:0>2}", ammo.0))
+                        .font(FontId::proportional(24.))
+                        .color(Color32::WHITE),
+                );
+            });
+        });
+}
+
 pub fn score_ui(mut contexts: EguiContexts, score: Res<Score>) {
     egui::Area::new("Score")
         .anchor(Align2::CENTER_TOP, egui::emath::vec2(10., 5.))
diff --git a/src/main.rs b/src/main.rs
index 61e5994..c186346 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -51,6 +51,8 @@ pub struct ImageAssets {
     #[asset(texture_atlas(tile_size_x = 495.0, tile_size_y = 32.0, columns = 1, rows = 1))]
     #[asset(path = "textures/ground.png")]
     pub ground: Handle<TextureAtlas>,
+    #[asset(path = "textures/icons.png")]
+    pub missile: Handle<Image>,
 }
 
 #[derive(States, Hash, Clone, PartialEq, Eq, Debug, Default)]