src/game.rs

@@ -4,6 +4,24 @@ use pancurses::Window;
 
 use crate::rooms;
 
+/// A dungeon root.
+pub struct Dungeon {
+    main_branch: DungeonBranch,
+}
+
+/// A single branch of a dungeon, which has a number of levels and
+/// which can potentially contain passages to other branches.
+pub struct DungeonBranch {
+    config: BranchConfig,
+    levels: Vec<DungeonLevel>,
+}
+
+/// The parameters that characterize a particular dungeon branch.
+/// Currently a unit struct because there's only one type of branch,
+/// but will later include e.g. architectural styles, good vs. evil &
+/// lawful vs. chaotic weights, etc.
+pub struct BranchConfig;
+
 /// The size of a dungeon level, in tiles.
 pub const LEVEL_SIZE: (usize, usize) = (80, 24);
 
@@ -33,7 +51,10 @@ pub enum DungeonTile {
 impl DungeonLevel {
     /// Creates a new level in a branch that has the given
     /// configuration.
-    pub fn new() -> Self {
+    pub fn new(_cfg: &BranchConfig) -> Self {
+        // Self {
+        //     tiles: rooms::generate_level(100, &mut rand::thread_rng()),
+        // }
         rooms::generate_level(100, &mut rand::thread_rng(), 1, 1)
     }
 

src/main.rs

@@ -1,7 +1,7 @@
 use std::process::exit;
 
 use components::{register_all, CharRender, MobAction, Mobile, Player, Position, TurnTaker};
-use level::DungeonLevel;
+use game::{BranchConfig, DungeonLevel};
 
 use pancurses::{endwin, initscr, noecho, Window};
 use player::player_turn;
@@ -9,7 +9,7 @@ use specs::prelude::*;
 use systems::{MobSystem, TimeSystem};
 
 mod components;
-mod level;
+mod game;
 mod player;
 mod rooms;
 mod systems;
@@ -20,17 +20,15 @@ fn main() {
 
     register_all(&mut world);
 
-    let level = DungeonLevel::new();
+    let cfg = BranchConfig;
+    let level = DungeonLevel::new(&cfg);
     let spawn_pos = level.upstairs()[0];
 
     world.insert(level);
 
     world
         .create_entity()
-        .with(Position {
+        .with(Position { x: spawn_pos.0, y: spawn_pos.1 })
-            x: spawn_pos.0,
-            y: spawn_pos.1,
-        })
         .with(CharRender { glyph: '@' })
         .with(Player)
         .with(Mobile {

src/player.rs

@@ -5,7 +5,7 @@ use specs::prelude::*;
 
 use crate::{
     components::{CharRender, MobAction, Mobile, Player, Position},
-    level::{DungeonLevel, DungeonTile},
+    game::{DungeonLevel, DungeonTile},
     quit,
 };
 

src/rooms.rs

@@ -20,7 +20,7 @@ use pathfinding::directed::astar::astar;
 use rand::Rng;
 
 use crate::{
-    level::{DungeonLevel, DungeonTile, LEVEL_SIZE},
+    game::{DungeonLevel, DungeonTile, LEVEL_SIZE},
     util::NiceFloat,
 };