Compare commits
3 commits
0ec5fbbe8c
...
6b6a6720ce
Author | SHA1 | Date | |
---|---|---|---|
Alex Bethel | 6b6a6720ce | ||
Alex Bethel | fee36f158b | ||
Alex Bethel | 97a78c8bb1 |
|
@ -4,24 +4,6 @@ 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);
|
||||
|
||||
|
@ -51,10 +33,7 @@ pub enum DungeonTile {
|
|||
impl DungeonLevel {
|
||||
/// Creates a new level in a branch that has the given
|
||||
/// configuration.
|
||||
pub fn new(_cfg: &BranchConfig) -> Self {
|
||||
// Self {
|
||||
// tiles: rooms::generate_level(100, &mut rand::thread_rng()),
|
||||
// }
|
||||
pub fn new() -> Self {
|
||||
rooms::generate_level(100, &mut rand::thread_rng(), 1, 1)
|
||||
}
|
||||
|
12
src/main.rs
12
src/main.rs
|
@ -1,7 +1,7 @@
|
|||
use std::process::exit;
|
||||
|
||||
use components::{register_all, CharRender, MobAction, Mobile, Player, Position, TurnTaker};
|
||||
use game::{BranchConfig, DungeonLevel};
|
||||
use level::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 game;
|
||||
mod level;
|
||||
mod player;
|
||||
mod rooms;
|
||||
mod systems;
|
||||
|
@ -20,15 +20,17 @@ fn main() {
|
|||
|
||||
register_all(&mut world);
|
||||
|
||||
let cfg = BranchConfig;
|
||||
let level = DungeonLevel::new(&cfg);
|
||||
let level = DungeonLevel::new();
|
||||
let spawn_pos = level.upstairs()[0];
|
||||
|
||||
world.insert(level);
|
||||
|
||||
world
|
||||
.create_entity()
|
||||
.with(Position { x: spawn_pos.0, y: spawn_pos.1 })
|
||||
.with(Position {
|
||||
x: spawn_pos.0,
|
||||
y: spawn_pos.1,
|
||||
})
|
||||
.with(CharRender { glyph: '@' })
|
||||
.with(Player)
|
||||
.with(Mobile {
|
||||
|
|
|
@ -5,7 +5,7 @@ use specs::prelude::*;
|
|||
|
||||
use crate::{
|
||||
components::{CharRender, MobAction, Mobile, Player, Position},
|
||||
game::{DungeonLevel, DungeonTile},
|
||||
level::{DungeonLevel, DungeonTile},
|
||||
quit,
|
||||
};
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ use pathfinding::directed::astar::astar;
|
|||
use rand::Rng;
|
||||
|
||||
use crate::{
|
||||
game::{DungeonLevel, DungeonTile, LEVEL_SIZE},
|
||||
level::{DungeonLevel, DungeonTile, LEVEL_SIZE},
|
||||
util::NiceFloat,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue