switch from lives to HP based approach

Author: olegbespalov

README.md

@@ -8,6 +8,10 @@
 
 A mission-based space shooter game built with Rust and Macroquad. Complete missions, destroy enemies, collect resources, and progress through increasingly challenging levels!
 
+> *"You're a mercenary pilot, drifting through the outer rim of civilized space. Out here, the only law is what you can enforce with your ship's cannons. The corporations pay well for rust piles and rare metals mined from the asteroid fields, but they don't tell you about the enemy patrols or the void pirates that call these deep space sectors home.*
+> 
+> *Every mission takes you deeper into the unknown. Every asteroid you crack could be your last. But the credits are good, and in this part of the galaxy, that's all that matters. Strap in, pilot. The void awaits."*
+
 ## Features
 
 - **Mission-Based Gameplay**: Complete objectives across multiple levels with increasing difficulty
@@ -17,9 +21,10 @@ A mission-based space shooter game built with Rust and Macroquad. Complete missi
 - **Loot System**: Collect scrap, rare metals, health packs, and weapon boosts
   - **Magnet Effect**: Loot items are automatically attracted to your ship when nearby
   - **Animated Loot**: Items rotate and drift realistically in space
-- **Resource Management**: Track scrap (ordinary currency) and rare metals (premium currency)
+- **Resource Management**: Track rust piles (scrap) and gold (rare metals) separately
+- **Health Point System**: Start with 100 HP - bigger asteroids deal more damage!
+- **Variable Damage**: Damage scales with asteroid size and bullet type
 - **High Score System**: Your high score is automatically saved and persists between sessions
-- **Lives System**: Start with 10 lives and collect health packs to extend your survival
 
 ## Controls
 
@@ -82,8 +87,9 @@ The game features a mission-based progression system:
 - **Briefing Screen**: View mission objectives before launching
 - **Mission Objectives**: Each mission requires completing specific goals:
   - Destroy a certain number of enemies
-  - Collect a certain amount of scrap
-- **Mission Success**: Complete objectives to progress to the next level
+  - Collect a certain amount of rust piles (scrap)
+  - Collect a certain amount of gold (rare metals)
+- **Mission Success**: Complete all objectives to progress to the next level
 - **Progressive Difficulty**: Missions become increasingly challenging with more enemies and asteroids
 
 ### Scoring
@@ -95,35 +101,49 @@ The game features a mission-based progression system:
 Loot items drop from destroyed asteroids and enemies:
 
 **From Regular Asteroids:**
-- **Scrap** (40% chance): 1-3 scrap pieces
-- **Rare Metal** (5% chance): 1 rare metal piece
+- **Rust Piles (Scrap)** (40% chance): 1-3 pieces
+- **Gold (Rare Metal)** (5% chance): 1 piece
 
 **From Rare Asteroids** (10% chance to spawn, always drop loot):
-- **Rare Metal** (50% chance): 2-4 rare metal pieces
-- **Scrap** (30% chance): 5-9 scrap pieces
-- **Health Pack** (10% chance): Restores 1 life
+- **Gold (Rare Metal)** (50% chance): 2-5 pieces
+- **Rust Piles (Scrap)** (30% chance): 5-9 pieces
+- **Health Pack** (10% chance): Restores health points
 - **Weapon Boost** (10% chance): Rapid fire for 10 seconds
 
 **From Enemy Ships:**
-- **Scrap** (30% chance): 5-9 scrap pieces
-- **Health Pack** (10% chance): Restores 1 life
+- **Rust Piles (Scrap)** (30% chance): 5-9 pieces
+- **Health Pack** (10% chance): Restores health points
 - **Weapon Boost** (5% chance): Rapid fire for 10 seconds
 
+**Note**: Health packs and weapon boosts do NOT count toward resource collection objectives
+
 **Loot Mechanics:**
 - Items drift and rotate in space for visual appeal
 - **Magnet Effect**: When within 150 units of your ship, loot is automatically attracted to you
 - Items are collected on contact with your ship
+- **Resource Tracking**: 
+  - Mission objectives track rust piles and gold separately
+  - Your inventory shows total resources collected: "Resources: Rust X | Gold Y"
+  - Mission progress shows: "Kills: X/Y  Rust: X/Y  Gold: X/Y"
 
 ### Gameplay
 
-- Start with 10 lives
-- Complete mission objectives to progress
+- **Health System**: Start with 100 HP (displayed as HP: current/max)
+- **Damage System**:
+  - **Asteroid Collisions**: Damage scales with asteroid size (bigger asteroids = more damage)
+    - Base damage: 5 HP per 10 units of radius
+    - Large asteroids (radius 40): ~20 HP damage
+    - Medium fragments (radius 20): ~10 HP damage
+    - Small fragments (radius 10): ~5 HP damage
+  - **Enemy Bullets**: Deal 15 HP damage
+  - **Player Bullets**: Deal 10 HP damage to enemies
+- Complete mission objectives to progress (kills, rust piles, and gold)
 - Destroy asteroids to break them into smaller pieces
 - Rare asteroids (10% spawn chance) have distinct appearance and better loot
 - Enemy ships spawn based on mission configuration and track your position
-- Collect scrap and rare metals for future upgrades (coming soon)
-- Colliding with asteroids or enemy bullets reduces your lives
-- When all lives are lost, your score is saved if it's a new high score
+- Collect rust piles and gold separately - missions require specific amounts of each
+- Health packs restore HP (capped at maximum)
+- When HP reaches 0, your score is saved if it's a new high score
 
 ## Project Structure
 

src/components.rs

@@ -9,8 +9,9 @@ pub struct Mission {
     pub description: String,
 
     // mission objectives
-    pub target_kills: u32, // how many enemies to destroy
-    pub target_scrap: u32, // how many scrap to collect
+    pub target_kills: u32,      // how many enemies to destroy
+    pub target_scrap: u32,      // how many scrap (rust piles) to collect
+    pub target_rare_metal: u32, // how many rare metal (gold) to collect
 
     // level difficulty settings
     pub enemy_spawn_interval: f32,
@@ -36,6 +37,7 @@ pub struct Bullet {
     pub vel: Vec2,
     pub life_time: f32,
     pub style: BulletStyle,
+    pub damage: f32, // Damage dealt by this bullet
 }
 
 pub struct Asteroid {
@@ -56,7 +58,8 @@ pub struct Ship {
     pub pos: Vec2,
     pub vel: Vec2,
     pub rotation: f32,
-    pub lives: i32,
+    pub health: f32,     // Current health points
+    pub max_health: f32, // Maximum health points
     pub shoot_timer: f32,
     pub rapid_fire_timer: f32,
     pub engine: Engine,
@@ -148,20 +151,22 @@ impl EnemyShip {
 
 impl Ship {
     // Returns true if the game is over
-    pub fn take_damage(&mut self, score: u32) -> bool {
-        self.lives -= 1;
+    pub fn take_damage(&mut self, damage: f32, score: u32) -> bool {
+        self.health -= damage;
 
-        if self.lives <= 0 {
+        if self.health <= 0.0 {
             // Save score immediately using our system
             crate::systems::save_score(score);
             true // Game Over
         } else {
-            // Reset position for next life
-            self.pos = vec2(screen_width() / 2.0, screen_height() / 2.0);
-            self.vel = vec2(0.0, 0.0);
             false // Still alive
         }
     }
+
+    // Restore health (used by health packs)
+    pub fn heal(&mut self, amount: f32) {
+        self.health = (self.health + amount).min(self.max_health);
+    }
 }
 
 impl Engine {

src/main.rs

@@ -17,6 +17,9 @@ const ACCELERATION: f32 = 150.0;
 const BULLET_SPEED: f32 = 400.0;
 const BULLET_LIFETIME: f32 = 2.0;
 const SHOOT_COOLDOWN: f32 = 0.3;
+const PLAYER_BULLET_DAMAGE: f32 = 10.0;
+const ENEMY_BULLET_DAMAGE: f32 = 15.0;
+const BASE_ASTEROID_DAMAGE: f32 = 5.0; // Base damage per 10 units of radius
 
 fn window_conf() -> Conf {
     Conf {
@@ -52,6 +55,7 @@ async fn main() {
     // current mission state
     let mut mission_kills = 0;
     let mut mission_scrap_collected = 0;
+    let mut mission_rare_metal_collected = 0;
 
     let mut enemy_spawn_timer = 0.0;
 
@@ -135,10 +139,23 @@ async fn main() {
 
                 draw_text_centered("OBJECTIVES:", 20.0, 30, GRAY);
 
-                let obj_text = format!(
-                    "- Destroy {} Enemies\n- Collect {} Scrap",
-                    current_mission.target_kills, current_mission.target_scrap
-                );
+                let mut objectives = vec![format!(
+                    "- Destroy {} Enemies",
+                    current_mission.target_kills
+                )];
+                if current_mission.target_scrap > 0 {
+                    objectives.push(format!(
+                        "- Collect {} Rust Piles",
+                        current_mission.target_scrap
+                    ));
+                }
+                if current_mission.target_rare_metal > 0 {
+                    objectives.push(format!(
+                        "- Collect {} Gold",
+                        current_mission.target_rare_metal
+                    ));
+                }
+                let obj_text = objectives.join("\n");
                 draw_text_centered(&obj_text, 70.0, 30, WHITE);
 
                 draw_text_centered("Press [SPACE] to Launch", 200.0, 30, GREEN);
@@ -157,6 +174,7 @@ async fn main() {
                     // reset the mission counters
                     mission_kills = 0;
                     mission_scrap_collected = 0;
+                    mission_rare_metal_collected = 0;
                     enemy_spawn_timer = current_mission.enemy_spawn_interval;
 
                     // reset the ship position (but keep the upgrades if there are any)
@@ -173,6 +191,7 @@ async fn main() {
                 // 1. Check the mission objectives
                 if mission_kills >= current_mission.target_kills
                     && mission_scrap_collected >= current_mission.target_scrap
+                    && mission_rare_metal_collected >= current_mission.target_rare_metal
                 {
                     state = GameState::MissionSuccess;
                 }
@@ -219,6 +238,7 @@ async fn main() {
                         vel: ship_dir * BULLET_SPEED + ship.vel,
                         life_time: BULLET_LIFETIME,
                         style: BulletStyle::Player,
+                        damage: PLAYER_BULLET_DAMAGE,
                     });
                     ship.shoot_timer = current_cooldown;
                 }
@@ -239,14 +259,16 @@ async fn main() {
                             vel: bullet_vel,
                             life_time: 4.0,
                             style: BulletStyle::Enemy,
+                            damage: ENEMY_BULLET_DAMAGE,
                         });
                         e.shoot_timer = 2.0;
                     }
                 }
                 enemy_ships.retain(|e| e.pos.x > -100.0 && e.pos.x < screen_width() + 100.0);
 
                 // 2. UPDATE LOOT (Magnet and Collection)
-                loot_items.retain_mut(|item| {
+                let mut items_to_remove = Vec::new();
+                for (i, item) in loot_items.iter_mut().enumerate() {
                     // Animation of slowing down the spread (initial explosion velocity)
                     item.vel *= 0.95;
                     item.pos += item.vel * dt;
@@ -282,24 +304,30 @@ async fn main() {
                         match item.item_type {
                             LootType::Scrap(amount) => {
                                 ship.scrap += amount;
-                                mission_scrap_collected += amount; // Для миссии
+                                mission_scrap_collected += amount; // Count for mission objective
                                                                    // play_sound_pickup();
                             }
                             LootType::RareMetal(amount) => {
                                 ship.rare_metal += amount;
-                                // play_sound_rare();
+                                mission_rare_metal_collected += amount; // Count for mission objective
+                                                                        // play_sound_rare();
                             }
                             LootType::HealthPack(hp) => {
-                                ship.lives += hp;
+                                ship.heal(hp as f32);
+                                // Health packs don't count as resources
                             }
                             LootType::WeaponBoost => {
                                 ship.rapid_fire_timer = 10.0;
+                                // Weapon boosts don't count as resources
                             }
                         }
-                        return false; // Remove from the world
+                        items_to_remove.push(i);
                     }
-                    true // Leave in the world
-                });
+                }
+                // Remove collected items (in reverse order to maintain indices)
+                for &i in items_to_remove.iter().rev() {
+                    loot_items.remove(i);
+                }
 
                 // 4. Update Physics
                 bullets.iter_mut().for_each(|b| {
@@ -371,7 +399,7 @@ async fn main() {
                 // enemy bullet hits the player
                 bullets.retain(|b| {
                     if b.style == BulletStyle::Enemy && (b.pos - ship.pos).length() < 20.0 {
-                        if ship.take_damage(score) {
+                        if ship.take_damage(b.damage, score) {
                             state = GameState::GameOver(score);
                         }
                         false // Remove bullet
@@ -382,8 +410,11 @@ async fn main() {
 
                 for i in (0..asteroids.len()).rev() {
                     if (ship.pos - asteroids[i].pos).length() < asteroids[i].radius + 10.0 {
+                        // Calculate damage based on asteroid size
+                        // Bigger asteroids deal more damage
+                        let asteroid_damage = (asteroids[i].radius / 10.0) * BASE_ASTEROID_DAMAGE;
                         asteroids.remove(i);
-                        if ship.take_damage(score) {
+                        if ship.take_damage(asteroid_damage, score) {
                             state = GameState::GameOver(score);
                         }
                         // break;
@@ -431,21 +462,31 @@ async fn main() {
                 draw_ship(&ship, &resources.ship_body, &resources.ship_flame);
 
                 draw_text(
-                    &format!("SCORE: {score}  LIVES: {}", ship.lives),
+                    &format!(
+                        "SCORE: {score}  HP: {:.0}/{:.0}",
+                        ship.health, ship.max_health
+                    ),
                     20.0,
                     30.0,
                     30.0,
                     WHITE,
                 );
 
                 let status = format!(
-                    "Kills: {}/{}  Scrap: {}/{}",
+                    "Kills: {}/{}  Rust: {}/{}  Gold: {}/{}",
                     mission_kills,
                     current_mission.target_kills,
                     mission_scrap_collected,
-                    current_mission.target_scrap
+                    current_mission.target_scrap,
+                    mission_rare_metal_collected,
+                    current_mission.target_rare_metal
                 );
                 draw_text(&status, 20.0, screen_height() - 30.0, 30.0, WHITE);
+
+                // Display total resources in inventory
+                let inventory =
+                    format!("Resources: Rust {} | Gold {}", ship.scrap, ship.rare_metal);
+                draw_text(&inventory, 20.0, screen_height() - 60.0, 25.0, GRAY);
             }
 
             GameState::MissionSuccess => {
@@ -488,7 +529,8 @@ fn create_ship() -> Ship {
         pos: vec2(screen_width() / 2.0, screen_height() / 2.0),
         vel: vec2(0.0, 0.0),
         rotation: 0.0,
-        lives: 10,
+        health: 100.0,
+        max_health: 100.0,
         shoot_timer: 0.0,
         rapid_fire_timer: 0.0,
         engine: Engine::basic(),

src/systems.rs

@@ -53,9 +53,10 @@ pub fn get_mission(level: u32) -> Mission {
         1 => Mission {
             level_id: 1,
             title: "Operation: Dust".to_string(),
-            description: "Destroy 3 scouts and collect 1 scrap.".to_string(),
+            description: "Destroy 3 scouts and collect resources.".to_string(),
             target_kills: 3,
             target_scrap: 1,
+            target_rare_metal: 0,
             enemy_spawn_interval: 10.0, // enemies spawn rarely
             asteroid_count: 5,
         },
@@ -65,15 +66,17 @@ pub fn get_mission(level: u32) -> Mission {
             description: "Enemy activity rising. Kill 10 enemies.".to_string(),
             target_kills: 10,
             target_scrap: 0, // scrap is not important
+            target_rare_metal: 0,
             enemy_spawn_interval: 2.0,
             asteroid_count: 8,
         },
         3 => Mission {
             level_id: 3,
             title: "Scrap Yard".to_string(),
-            description: "Collect 20 scrap for upgrades.".to_string(),
+            description: "Collect 20 rust piles and 3 gold for upgrades.".to_string(),
             target_kills: 5,
             target_scrap: 20,
+            target_rare_metal: 3,
             enemy_spawn_interval: 2.5,
             asteroid_count: 12,
         },
@@ -83,7 +86,8 @@ pub fn get_mission(level: u32) -> Mission {
             title: format!("Deep Space sector {level}"),
             description: "Survive.".to_string(),
             target_kills: 10 + level,
-            target_scrap: 10,
+            target_scrap: 10 + (level / 2),
+            target_rare_metal: 2 + (level / 3),
             enemy_spawn_interval: (1.5 - (level as f32 * 0.1)).max(0.5),
             asteroid_count: 10 + level as usize,
         },