Move level into actor/

Author: benfrankel

src/game.rs

@@ -4,7 +4,6 @@ pub mod actor;
 pub mod card;
 pub mod cleanup;
 pub mod combat;
-pub mod level;
 pub mod music;
 pub mod spotlight;
 pub mod sprite;
@@ -23,7 +22,6 @@ pub(super) fn plugin(app: &mut App) {
         card::plugin,
         cleanup::plugin,
         combat::plugin,
-        level::plugin,
         music::plugin,
         spotlight::plugin,
         sprite::plugin,

src/game/actor.rs

@@ -3,6 +3,7 @@ pub mod enemy;
 pub mod facing;
 pub mod faction;
 pub mod health;
+pub mod level;
 pub mod movement;
 pub mod player;
 
@@ -21,15 +22,15 @@ use crate::game::actor::attack::AttackController;
 use crate::game::actor::facing::Facing;
 use crate::game::actor::health::Health;
 use crate::game::actor::health::HealthBar;
+use crate::game::actor::level::xp::Xp;
+use crate::game::actor::level::xp::XpReward;
+use crate::game::actor::level::Level;
 use crate::game::actor::movement::Movement;
 use crate::game::actor::movement::MovementController;
 use crate::game::actor::movement::OldMovementController;
 use crate::game::card::deck::Deck;
 use crate::game::combat::death::DespawnOnDeath;
 use crate::game::combat::hit::Hurtbox;
-use crate::game::level::xp::Xp;
-use crate::game::level::xp::XpReward;
-use crate::game::level::Level;
 use crate::game::sprite::SpriteAnimation;
 use crate::util::prelude::*;
 
@@ -42,6 +43,7 @@ pub(super) fn plugin(app: &mut App) {
         facing::plugin,
         faction::plugin,
         health::plugin,
+        level::plugin,
         movement::plugin,
         player::plugin,
     ));

src/game/level.rs src/game/actor/level.rs

@@ -1,9 +1,9 @@
 use bevy::prelude::*;
 
 use crate::core::UpdateSet;
-use crate::game::level::xp::Xp;
-use crate::game::level::Level;
-use crate::game::level::LevelConfig;
+use crate::game::actor::level::xp::Xp;
+use crate::game::actor::level::Level;
+use crate::game::actor::level::LevelConfig;
 use crate::util::prelude::*;
 
 // TODO: System that enters level up menu on LevelUp event.

src/game/level/up.rs src/game/actor/level/up.rs

@@ -4,9 +4,9 @@ use serde::Serialize;
 
 use crate::core::UpdateSet;
 use crate::game::actor::faction::Faction;
+use crate::game::actor::level::Level;
+use crate::game::actor::level::LevelConfig;
 use crate::game::combat::death::OnDeath;
-use crate::game::level::Level;
-use crate::game::level::LevelConfig;
 use crate::ui::prelude::*;
 use crate::util::prelude::*;
 

src/game/level/xp.rs src/game/actor/level/xp.rs

@@ -8,7 +8,7 @@ use serde::Serialize;
 use crate::core::camera::CameraRoot;
 use crate::core::UpdateSet;
 use crate::game::actor::enemy::enemy;
-use crate::game::level::Level;
+use crate::game::actor::level::Level;
 use crate::game::music::beat::on_beat;
 use crate::screen::Screen;
 use crate::util::prelude::*;

src/game/wave.rs

@@ -5,10 +5,10 @@ use iyes_progress::prelude::*;
 use pyri_state::prelude::*;
 
 use crate::game::actor::health::HealthConfig;
+use crate::game::actor::level::LevelConfig;
 use crate::game::actor::ActorConfig;
 use crate::game::card::CardConfig;
 use crate::game::combat::projectile::ProjectileConfig;
-use crate::game::level::LevelConfig;
 use crate::game::music::MusicConfig;
 use crate::game::wave::WaveConfig;
 use crate::screen::fade_in;

src/screen/loading.rs

@@ -8,10 +8,10 @@ use pyri_state::schedule::ResolveStateSet;
 
 use crate::core::camera::CameraRoot;
 use crate::core::pause::Pause;
+use crate::game::actor::level::xp::IsXpBarFill;
+use crate::game::actor::level::IsLevelIndicator;
 use crate::game::actor::player::player;
 use crate::game::card::deck::deck_display;
-use crate::game::level::xp::IsXpBarFill;
-use crate::game::level::IsLevelIndicator;
 use crate::game::spotlight::spotlight_lamp_spawner;
 use crate::game::GameRoot;
 use crate::screen::fade_in;

src/screen/playing.rs

@@ -5,10 +5,10 @@ use iyes_progress::prelude::*;
 use pyri_state::prelude::*;
 
 use crate::game::actor::health::HealthConfig;
+use crate::game::actor::level::LevelConfig;
 use crate::game::actor::ActorConfig;
 use crate::game::card::CardConfig;
 use crate::game::combat::projectile::ProjectileConfig;
-use crate::game::level::LevelConfig;
 use crate::game::music::MusicConfig;
 use crate::game::wave::WaveConfig;
 use crate::screen::fade_in;