overwork xp handling, killing givces more

Author: DarthB

scripts/main.roto

@@ -15,7 +15,7 @@ fn get_chaser_enemy_stats() -> EntityStats {
 
 fn get_game_constants() -> GameConstants {
     # out of bounds margin, spawn target offset, goal wave
-    GameConstants.new(50.0, 50.0, 1)
+    GameConstants.new(50.0, 50.0, 10)
 }
 
 fn get_wave_composition(wave_number: u32) -> WaveComposition {

src/gamestate/mod.rs

@@ -47,6 +47,7 @@ pub struct GameState {
     pub projectiles_to_despawn: HashSet<EntityId>,
     pub message_from_elf: Option<String>,
     pub assets: Assets,
+    pub num_lvlups: u32,
 }
 
 impl GameState {
@@ -125,10 +126,11 @@ I will summon magic to to beat the evil!.
             projectiles_to_despawn: HashSet::new(),
             message_from_elf: Some(tmp.to_owned()),
             assets,
+            num_lvlups: 1,
         }
     }
 
-    pub fn check_collisions(&mut self) {
+    pub fn check_collisions(&mut self) -> u32 {
         // Check player-enemy collisions
         let mut game_over = false;
         for enemy in &self.enemies {
@@ -148,11 +150,11 @@ I will summon magic to to beat the evil!.
             self.set_next_state(GameStateEnum::GameOver);
         }
 
-        // Check projectile-enemy collisions
-        self.check_projectile_enemy_collisions();
-
         // Check enemy-enemy collisions with elastic bounce
         self.check_enemy_collisions();
+
+        // Check projectile-enemy collisions
+        self.check_projectile_enemy_collisions()
     }
 
     fn check_enemy_collisions(&mut self) {
@@ -198,7 +200,8 @@ I will summon magic to to beat the evil!.
         }
     }
 
-    fn check_projectile_enemy_collisions(&mut self) {
+    fn check_projectile_enemy_collisions(&mut self) -> u32 {
+        let mut killed_enemies = 0;
         for projectile in &self.projectiles {
             for enemy in &self.enemies {
                 let collision_data = check_collision(
@@ -209,7 +212,10 @@ I will summon magic to to beat the evil!.
                 );
 
                 if collision_data.collided {
+                    killed_enemies += 1;
                     self.enemies_to_despawn.insert(enemy.id);
+                    // we killed it by ourselves, one more xp:
+
                     // Energy balls get removed on hit, pulses stay
                     match projectile.projectile_type {
                         ProjectileType::EnergyBall | ProjectileType::HomingMissile => {
@@ -222,6 +228,7 @@ I will summon magic to to beat the evil!.
                 }
             }
         }
+        killed_enemies
     }
 
     pub fn check_player_bounds(&mut self) {
@@ -286,6 +293,13 @@ I will summon magic to to beat the evil!.
         if is_key_pressed(KeyCode::P) {
             self.paused = !self.paused;
         }
+
+        if is_key_pressed(KeyCode::X) {
+            self.num_lvlups = self.player.add_xp(100);
+            if self.num_lvlups > 0 {
+                self.set_next_state(GameStateEnum::WeaponSelection);
+            }
+        }
     }
 
     pub fn reload_roto_scripts(&mut self) {
@@ -458,17 +472,7 @@ I will summon magic to to beat the evil!.
     }
 
     pub fn process_despawns(&mut self) {
-        // Award XP for each enemy killed
-        let enemies_killed = self.enemies_to_despawn.len() as u32;
-        if enemies_killed > 0 {
-            // Award 1 XP per enemy killed
-            let leveled_up = self.player.add_xp(enemies_killed);
-
-            // If player leveled up, transition to weapon selection
-            if leveled_up {
-                self.set_next_state(GameStateEnum::WeaponSelection);
-            }
-        }
+        self.enemies_to_despawn.len() as u32;
 
         self.enemies
             .retain(|e| !self.enemies_to_despawn.contains(&e.id));

src/gamestate/playing.rs

@@ -3,6 +3,7 @@ use macroquad::prelude::*;
 use super::GameState;
 use crate::DT;
 use crate::enemy::EnemyType;
+use crate::gamestate::GameStateEnum;
 use crate::roto_script::WaveConfig;
 
 pub fn process(gs: &mut GameState) {
@@ -72,9 +73,20 @@ pub fn update_logic(gs: &mut GameState) {
     gs.despawn_enemies_out_of_bounds();
 
     // This may trigger game over
-    gs.check_collisions();
+    let num_kills = gs.check_collisions();
     gs.check_player_bounds();
 
+    // leveling:
+    let enemies_died = gs.enemies_to_despawn.len() as u32;
+    // Award 1 XP per enemy killed
+    let leveled_up = gs.player.add_xp(enemies_died + num_kills);
+    gs.num_lvlups = leveled_up;
+
+    // If player leveled up, transition to weapon selection
+    if leveled_up > 0 {
+        gs.set_next_state(GameStateEnum::WeaponSelection);
+    }
+
     // Process all despawns at the end
     gs.process_despawns();
 }

src/gamestate/weapon_selection.rs

@@ -22,6 +22,10 @@ pub fn process(gs: &mut GameState) {
     } else if is_key_pressed(KeyCode::Key3) {
         handle_weapon_selection(gs, WeaponType::HomingMissile);
     }
+
+    if gs.num_lvlups == 0 {
+        gs.set_next_state(super::GameStateEnum::Playing);
+    }
 }
 
 fn handle_weapon_selection(gs: &mut GameState, weapon_type: WeaponType) {
@@ -31,14 +35,14 @@ fn handle_weapon_selection(gs: &mut GameState, weapon_type: WeaponType) {
     if let Some(index) = weapons.iter().position(|w| w.weapon_type == weapon_type) {
         // Player has this weapon - upgrade it
         gs.player.level_up_weapon(index);
-        gs.set_next_state(super::GameStateEnum::Playing);
     } else {
         // Player doesn't have this weapon - add it (if room available)
         if weapons.len() < 3 {
             gs.player.add_weapon(weapon_type);
-            gs.set_next_state(super::GameStateEnum::Playing);
         }
     }
+
+    gs.num_lvlups -= 1;
 }
 
 pub fn draw(gs: &GameState) {
@@ -70,9 +74,10 @@ pub fn draw(gs: &GameState) {
 
 fn draw_weapon_selection(gs: &GameState, context: WeaponSelectionContext) {
     // Draw title
+    let lvl_str = format!("{} LEVEL UP(s) - SELECT OUR MAGIC!", gs.num_lvlups);
     let title = match context {
         WeaponSelectionContext::InitialSelection => "SELECT OUR MAGIC!",
-        WeaponSelectionContext::LevelUp => "LEVEL UP - SELECT OUR MAGIC!",
+        WeaponSelectionContext::LevelUp => lvl_str.as_str(),
     };
     let title_size = 40.0;
     let title_width = measure_text(title, None, title_size as u16, 1.0).width;

src/main.rs

@@ -1,5 +1,3 @@
-use std::rc::Rc;
-
 use macroquad::prelude::*;
 
 mod collision;

src/player.rs

@@ -49,7 +49,7 @@ impl Player {
         } else {
             let mut total = 0;
             for i in 1..=level {
-                total += 5 * i;
+                total += 9 * i;
             }
             total
         }
@@ -59,15 +59,16 @@ impl Player {
         Self::xp_for_level(self.level + 1)
     }
 
-    pub fn add_xp(&mut self, xp: u32) -> bool {
+    pub fn add_xp(&mut self, xp: u32) -> u32 {
+        let mut num_levelups = 0u32;
         self.xp += xp;
 
         // Check if we leveled up
-        if self.xp >= self.xp_for_next_level() {
+        while self.xp >= self.xp_for_next_level() {
             self.level += 1;
-            return true; // Level up occurred
+            num_levelups += 1;
         }
-        false
+        num_levelups
     }
 
     pub fn get_level(&self) -> u32 {